0.15.

svn path=/trunk/; revision=13289

32 files changed, 39379 insertions, 31279 deletions

diff --git a/ChangeLog b/ChangeLog
index 423d972d5a..d4256658ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-01  Ettore Perazzoli  <ettore@ximian.com>
+
+	* configure.in: 0.15.  Require gal 0.13 and gtkhtml 0.14.
+
 2001-10-01  Christopher James Lahey  <clahey@ximian.com>
 
 	* NEWS (Addressbook): Added more news.
diff --git a/configure.in b/configure.in
index b2b5051641..1aeb1c48ed 100644
--- a/configure.in
+++ b/configure.in
@@ -3,9 +3,9 @@ AC_INIT(camel)
 AM_CONFIG_HEADER(config.h)
 
 EVOLUTION_MAJOR_VERSION=0
-EVOLUTION_MINOR_VERSION=14
-EVOLUTION_MICRO_VERSION=99
-VERSION=$EVOLUTION_MAJOR_VERSION.$EVOLUTION_MINOR_VERSION.$EVOLUTION_MICRO_VERSION
+EVOLUTION_MINOR_VERSION=15
+EVOLUTION_MICRO_VERSION=0
+VERSION=$EVOLUTION_MAJOR_VERSION.$EVOLUTION_MINOR_VERSION
 PACKAGE=evolution
 
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
@@ -571,8 +571,8 @@ EVO_CHECK_LIB(Bonobo, bonobox, 1.0.3)
 EVO_CHECK_LIB(OAF, oaf, 0.6.2)
 EVO_CHECK_LIB(libglade, libglade, 0.14)
 EVO_CHECK_LIB(gdk-pixbuf with GNOME canvas support, gnomecanvaspixbuf, 0.9.0)
-EVO_CHECK_LIB(GAL, gal, 0.12.99.0)
-EVO_CHECK_LIB(GtkHTML, gtkhtml, 0.13)
+EVO_CHECK_LIB(GAL, gal, 0.13)
+EVO_CHECK_LIB(GtkHTML, gtkhtml, 0.14)
 EVO_CHECK_LIB(GNOME-VFS, vfs, 1.0)
 EVO_CHECK_LIB(libxml, xml, 1.8.10, 2.0)
 EVO_CHECK_LIB(bonobo-conf, bonobo_conf, 0.11)
diff --git a/po/ChangeLog b/po/ChangeLog
index 15bec7e5ba..473fcee614 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,15 @@
+2001-10-01  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.39.
+
+2001-10-01  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.39.
+
+2001-10-01  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.39.
+
 2001-10-02  Valek Filippov  <frob@df.ru>
 
 	* ru.po: updated russian translation.
diff --git a/po/az.po b/po/az.po
index d19a500fc7..c5e9b35a3d 100644
--- a/po/az.po
+++ b/po/az.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.3.1\n"
-"POT-Creation-Date: 2001-09-21 18:31-0400\n"
+"POT-Creation-Date: 2001-10-01 19:06-0400\n"
 "PO-Revision-Date: 2001-05-23 00:10GMT +0200\n"
 "Last-Translator: Vasif İsmayıloğlu MD <azerb_linux@hotmail.com>\n"
 "Language-Team: Azerbaijani Turkish <linuxaz@azerimal.net>\n"
@@ -34,293 +34,293 @@ msgid "Name"
 msgstr "Ad"
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#, fuzzy
-msgid "Family Name"
-msgstr "Tam Ad"
-
-#: addressbook/backend/ebook/e-card-simple.c:61
 #: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Email"
 msgstr "ePoçt"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:61
 #: addressbook/gui/contact-editor/e-contact-editor.c:1609
 msgid "Primary"
 msgstr "İlk"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:61
 #, fuzzy
 msgid "Prim"
 msgstr "İlk"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:92
 #: addressbook/gui/contact-editor/e-contact-editor.c:1594
 #: addressbook/gui/widgets/e-addressbook-view.c:902
 msgid "Assistant"
 msgstr "Köməkçi"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/gui/contact-editor/e-contact-editor.c:1595
 #: addressbook/gui/contact-editor/e-contact-editor.c:1662
 msgid "Business"
 msgstr "Məslək"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/backend/ebook/e-card-simple.c:68
 #, fuzzy
 msgid "Bus"
 msgstr "Məşğul"
 
-#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/gui/contact-editor/e-contact-editor.c:1598
 msgid "Callback"
 msgstr "Geri axtarma"
 
-#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/gui/contact-editor/e-contact-editor.c:1600
 msgid "Company"
 msgstr "Şirkət"
 
-#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:65
 #, fuzzy
 msgid "Comp"
 msgstr "Köçürt"
 
-#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:69
 #: addressbook/gui/contact-editor/e-contact-editor.c:1601
 #: addressbook/gui/contact-editor/e-contact-editor.c:1663
 msgid "Home"
 msgstr "Ev"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:67
 #: addressbook/gui/widgets/e-addressbook-view.c:877
 msgid "Organization"
 msgstr "Şirkət"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:67
 #, fuzzy
 msgid "Org"
 msgstr ""
 "\n"
 "Quruluş:\t"
 
-#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/e-contact-editor.c:1605
 msgid "Mobile"
 msgstr "Cib telefonu"
 
-#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/e-contact-editor.c:1599
 msgid "Car"
 msgstr "Maşın"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/e-contact-editor.c:1597
 #: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "Business Fax"
 msgstr "Məsləki Faks"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/backend/ebook/e-card-simple.c:72
 #, fuzzy
 msgid "Bus Fax"
 msgstr "Məsləki Faks"
 
-#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/backend/ebook/e-card-simple.c:73
 #: addressbook/gui/contact-editor/e-contact-editor.c:1603
 #: addressbook/gui/widgets/e-addressbook-view.c:883
 msgid "Home Fax"
 msgstr "Ev faksı"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/e-contact-editor.c:1596
 msgid "Business 2"
 msgstr "2.nci Məslək"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/backend/ebook/e-card-simple.c:74
 #, fuzzy
 msgid "Bus 2"
 msgstr "Məşğul"
 
-#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/backend/ebook/e-card-simple.c:75
 #: addressbook/gui/contact-editor/e-contact-editor.c:1602
 msgid "Home 2"
 msgstr "2.nci ev"
 
-#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/backend/ebook/e-card-simple.c:76
 #: addressbook/gui/contact-editor/e-contact-editor.c:1604
 #: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/backend/ebook/e-card-simple.c:83
 #: addressbook/gui/contact-editor/e-contact-editor.c:1606
 #: addressbook/gui/contact-editor/e-contact-editor.c:1664
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:52
 msgid "Other"
 msgstr "Başqa"
 
-#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/backend/ebook/e-card-simple.c:78
 #: addressbook/gui/contact-editor/e-contact-editor.c:1607
 #: addressbook/gui/widgets/e-addressbook-view.c:888
 msgid "Other Fax"
 msgstr "Başqa faks"
 
-#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/gui/contact-editor/e-contact-editor.c:1608
 #: addressbook/gui/widgets/e-addressbook-view.c:889
 msgid "Pager"
 msgstr "Peycer"
 
-#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/backend/ebook/e-card-simple.c:80
 #: addressbook/gui/contact-editor/e-contact-editor.c:1610
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/backend/ebook/e-card-simple.c:81
 #: addressbook/gui/contact-editor/e-contact-editor.c:1611
 #: addressbook/gui/widgets/e-addressbook-view.c:891
 msgid "Telex"
 msgstr "Teleks"
 
-#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/backend/ebook/e-card-simple.c:82
 #: addressbook/gui/widgets/e-addressbook-view.c:892
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/backend/ebook/e-card-simple.c:84
 #: addressbook/gui/component/e-address-popup.c:476
 #: addressbook/gui/contact-editor/e-contact-editor.c:1637
 #: addressbook/gui/widgets/e-addressbook-view.c:894
 msgid "Email 2"
 msgstr "2.nci ePoçt ünvanı"
 
-#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/backend/ebook/e-card-simple.c:85
 #: addressbook/gui/component/e-address-popup.c:486
 #: addressbook/gui/contact-editor/e-contact-editor.c:1638
 #: addressbook/gui/widgets/e-addressbook-view.c:895
 msgid "Email 3"
 msgstr "3.ncü ePoçt ünvanı"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/widgets/e-addressbook-view.c:896
 msgid "Web Site"
 msgstr "Web Səhifəsi"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:86
 msgid "Url"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/widgets/e-addressbook-view.c:897
 msgid "Department"
 msgstr "Bölmə"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:87
 msgid "Dep"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/backend/ebook/e-card-simple.c:88
 #: addressbook/gui/widgets/e-addressbook-view.c:898
 msgid "Office"
 msgstr "İdarə"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/backend/ebook/e-card-simple.c:88
 #, fuzzy
 msgid "Off"
 msgstr "İdarə"
 
-#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card-simple.c:89
 #: addressbook/gui/widgets/e-addressbook-view.c:899
 msgid "Title"
 msgstr "Başlıq"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:90
 #: addressbook/gui/widgets/e-addressbook-view.c:900
 msgid "Profession"
 msgstr "Məslək"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Prof"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:91
 #: addressbook/gui/widgets/e-addressbook-view.c:901
 msgid "Manager"
 msgstr "İdarəci"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:91
 #, fuzzy
 msgid "Man"
 msgstr "May"
 
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:92
 msgid "Ass"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card-simple.c:93
 #: addressbook/gui/widgets/e-addressbook-view.c:903
 msgid "Nickname"
 msgstr "Ləqəb"
 
-#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card-simple.c:93
 #, fuzzy
 msgid "Nick"
 msgstr "Ləqəb"
 
-#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/backend/ebook/e-card-simple.c:94
 #: addressbook/gui/widgets/e-addressbook-view.c:904
 msgid "Spouse"
 msgstr "Yoldaş"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card-simple.c:95
 #: addressbook/gui/widgets/e-addressbook-view.c:905
 msgid "Note"
 msgstr "Qeyd"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:96
 #, fuzzy
 msgid "Calendar URI"
 msgstr "Təqvim"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:96
 msgid "CALUri"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:97
 #: addressbook/gui/widgets/e-addressbook-view.c:906
 msgid "Free-busy URL"
 msgstr "Sərbəst/məşğul URL"
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:97
 msgid "FBUrl"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:98
 #, fuzzy
 msgid "Anniversary"
 msgstr "_İl dönümü :"
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "Anniv"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card-simple.c:99
 #, fuzzy
 msgid "Birth Date"
 msgstr ""
 "\n"
 "Ad günü:  "
 
-#: addressbook/backend/ebook/e-card-simple.c:103
+#: addressbook/backend/ebook/e-card-simple.c:102
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "Kateqoriyalar"
 
+#: addressbook/backend/ebook/e-card-simple.c:103
+#, fuzzy
+msgid "Family Name"
+msgstr "Tam Ad"
+
 #: addressbook/backend/ebook/e-card.c:3564
 msgid "Card: "
 msgstr "Kart: "
@@ -621,10 +621,10 @@ msgstr "%s üçün parol girin"
 #: 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:1119
+#: addressbook/conduit/address-conduit.c:1167
 #: addressbook/gui/component/addressbook-factory.c:48
-#: calendar/conduits/calendar/calendar-conduit.c:1204
-#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/conduits/calendar/calendar-conduit.c:1262
+#: calendar/conduits/todo/todo-conduit.c:1034
 #: calendar/gui/alarm-notify/notify-main.c:78 calendar/gui/main.c:63
 msgid "Could not initialize Bonobo"
 msgstr "Bonoboyu başlada bilmədim"
@@ -696,20 +696,20 @@ msgstr "Ox yüklənə bilmədi\n"
 msgid "EBook not loaded\n"
 msgstr "eKitab yüklənmədi\n"
 
-#: addressbook/conduit/address-conduit.c:681
-#: calendar/conduits/calendar/calendar-conduit.c:778
-#: calendar/conduits/todo/todo-conduit.c:592
+#: addressbook/conduit/address-conduit.c:731
+#: calendar/conduits/calendar/calendar-conduit.c:837
+#: calendar/conduits/todo/todo-conduit.c:609
 msgid "Could not start wombat server"
 msgstr "Wombat xidməti başladıla bilmədi"
 
-#: addressbook/conduit/address-conduit.c:682
-#: calendar/conduits/calendar/calendar-conduit.c:779
-#: calendar/conduits/todo/todo-conduit.c:593
+#: addressbook/conduit/address-conduit.c:732
+#: calendar/conduits/calendar/calendar-conduit.c:838
+#: calendar/conduits/todo/todo-conduit.c:610
 msgid "Could not start wombat"
 msgstr "Wombatı başlada bilmədim"
 
-#: addressbook/conduit/address-conduit.c:714
-#: addressbook/conduit/address-conduit.c:717
+#: addressbook/conduit/address-conduit.c:762
+#: addressbook/conduit/address-conduit.c:765
 msgid "Could not read pilot's Address application block"
 msgstr "Pilot Ünvan əlavələri bloku oxuna bilmədi"
 
@@ -754,8 +754,8 @@ msgid "Factory for the sample Addressbook control"
 msgstr "Nümunəvi ünvan dəftəri idarəsi e'malatxanası"
 
 #: addressbook/gui/component/addressbook-component.c:66
-#: calendar/gui/dialogs/comp-editor-util.c:281
-#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:173
+#: calendar/gui/dialogs/comp-editor-util.c:289
+#: calendar/gui/dialogs/comp-editor-util.c:345 shell/e-local-storage.c:173
 #: shell/e-shortcuts.c:1062
 #, fuzzy
 msgid "Contacts"
@@ -779,23 +779,23 @@ msgstr ""
 "Süzgəc mə'lumatını yükləmə xətası:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-component.c:386
+#: addressbook/gui/component/addressbook-component.c:411
 #: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "New Contact"
 msgstr "Yeni əlaqə"
 
-#: addressbook/gui/component/addressbook-component.c:386
+#: addressbook/gui/component/addressbook-component.c:411
 #, fuzzy
 msgid "New _Contact"
 msgstr "Yeni əlaqə"
 
-#: addressbook/gui/component/addressbook-component.c:387
+#: addressbook/gui/component/addressbook-component.c:412
 #, fuzzy
 msgid "New Contact List"
 msgstr "Yeni əlaqə"
 
-#: addressbook/gui/component/addressbook-component.c:387
+#: addressbook/gui/component/addressbook-component.c:412
 #, fuzzy
 msgid "New Contact _List"
 msgstr "Yeni əlaqə"
@@ -905,19 +905,19 @@ msgid "_Account name:"
 msgstr "Hesab İdarəsi"
 
 #: addressbook/gui/component/addressbook-config.glade.h:22
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: 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:90 my-evolution/my-evolution.glade.h:20
+#: mail/mail-config.glade.h:91 my-evolution/my-evolution.glade.h:20
 msgid "_Add"
 msgstr "_Əlavə Et"
 
 #: addressbook/gui/component/addressbook-config.glade.h:23
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:95
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:96
 #: ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
 #: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
 msgstr "_Düzəlt"
@@ -941,37 +941,37 @@ msgstr "Verici İsmarıcı:"
 msgid "Other Contacts"
 msgstr "Digər Əlaqələr"
 
-#: addressbook/gui/component/addressbook.c:393
+#: addressbook/gui/component/addressbook.c:407
 #, fuzzy, c-format
 msgid "Please enter your email address and password for access to %s"
 msgstr "%s üçün %s parol kalimanizi lürfən girin"
 
-#: addressbook/gui/component/addressbook.c:401
+#: addressbook/gui/component/addressbook.c:415
 #, fuzzy
 msgid "LDAP Authentication"
 msgstr "Tanıtma"
 
-#: addressbook/gui/component/addressbook.c:412
+#: addressbook/gui/component/addressbook.c:426
 msgid "Email Address:"
 msgstr "ePoçt Ünvanı: "
 
-#: addressbook/gui/component/addressbook.c:425
+#: addressbook/gui/component/addressbook.c:439
 #, fuzzy
 msgid "Password:"
 msgstr "Parol"
 
-#: addressbook/gui/component/addressbook.c:488
+#: addressbook/gui/component/addressbook.c:502
 msgid "Unable to open addressbook"
 msgstr "Ünvan dəftərini aça bilmədim"
 
-#: addressbook/gui/component/addressbook.c:495
+#: addressbook/gui/component/addressbook.c:509
 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:500
+#: addressbook/gui/component/addressbook.c:514
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -979,45 +979,45 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:508
+#: addressbook/gui/component/addressbook.c:522
 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:649
+#: addressbook/gui/component/addressbook.c:663
 #: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "Daxil edən hər hansı üzv"
 
-#: addressbook/gui/component/addressbook.c:650
+#: addressbook/gui/component/addressbook.c:664
 msgid "Name contains"
 msgstr "Ad daxil edən"
 
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:665
 msgid "Email contains"
 msgstr "ePoçt daxil edən"
 
-#: addressbook/gui/component/addressbook.c:652
+#: addressbook/gui/component/addressbook.c:666
 #: calendar/gui/cal-search-bar.c:59
 #, fuzzy
 msgid "Category is"
 msgstr "Kateqoriyalar"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:653 widgets/misc/e-filter-bar.h:97
+#: addressbook/gui/component/addressbook.c:667 widgets/misc/e-filter-bar.h:97
 #: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "Ətraflı..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:883
+#: addressbook/gui/component/addressbook.c:897
 #: calendar/gui/cal-search-bar.c:412
 #, fuzzy
 msgid "Any Category"
 msgstr "Kateqoriyalar:"
 
-#: addressbook/gui/component/addressbook.c:925
+#: addressbook/gui/component/addressbook.c:939
 msgid "The URI that the Folder Browser will display"
 msgstr "Qovluq Səyyahını göstərəcək olan URI"
 
@@ -1032,7 +1032,7 @@ msgid "(none)"
 msgstr "( Adsızdır )"
 
 #: addressbook/gui/component/e-address-popup.c:466
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #: addressbook/gui/contact-editor/e-contact-editor.c:1636
 msgid "Primary Email"
 msgstr "İlk ePoçt ünvanı"
@@ -1212,120 +1212,127 @@ msgstr "Ətraflı"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
 #, fuzzy
+msgid "F_ree/Busy URL:"
+msgstr "Sərbəst/məşğul URL"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#, fuzzy
 msgid "File A_s:"
 msgstr "Fərqli fayllalə:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "General"
 msgstr "Ümumi"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+msgid ""
+"If this person publishes free/busy or other calendar information on the "
+"Internet, enter the address\n"
+"of that information here."
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "New phone type"
 msgstr "Yeni telefon növü"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "No_tes:"
 msgstr "_Qeydlər:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #, fuzzy
 msgid "Organi_zation:"
 msgstr "Orqanizasiya"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "Phone Types"
 msgstr "Telefon Növləri"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "Wants to receive _HTML mail"
 msgstr "_HTML ePoçtlarını qəbul edir"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Address..."
 msgstr "_Ünvan..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "_Assistant's name:"
 msgstr "_Köməkçi adı :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Birthday:"
 msgstr "_Ad günü :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Business"
 msgstr "_Məslək"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#, fuzzy
-msgid "_Calendar Information:"
-msgstr "təqvim haqqında"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 #: calendar/gui/dialogs/event-page.glade.h:12
 #: calendar/gui/dialogs/task-page.glade.h:10
 msgid "_Contacts..."
 msgstr "_Əlaqələr ..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:834 filter/filter.glade.h:8
-#: mail/folder-browser.c:1371 mail/mail-config.glade.h:94
+#: mail/folder-browser.c:1406 mail/mail-config.glade.h:95
 #: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "_Sil"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Department:"
 msgstr "_Bölmə :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#, fuzzy
-msgid "_Free/Busy Information:"
-msgstr "İstənən Mə'lumatlar"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Full Name..."
 msgstr "_Tam Ad ..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Home"
 msgstr "_Ev"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Job title:"
 msgstr "Məslək _izahı:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Manager's Name:"
 msgstr "_İdarəcinin Adı :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Mobile"
 msgstr "_Cib"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Nickname:"
 msgstr "_Ləqəb :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Office:"
 msgstr "_İdarə :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Profession:"
 msgstr "_Məslək :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#, fuzzy
+msgid "_Public Calendar URL:"
+msgstr "Təqvim"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Spouse:"
 msgstr "_Yoldaş:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_This is the mailing address"
 msgstr "_Bu ePoçt ünvanıdır"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "_Web page address:"
 msgstr "Web səhifəsi :"
@@ -2587,7 +2594,7 @@ msgstr "%d saniyə"
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
 #: addressbook/gui/widgets/e-addressbook-view.c:691
 #: addressbook/gui/widgets/e-addressbook-view.c:753
-#: addressbook/gui/widgets/e-addressbook-view.c:1373
+#: addressbook/gui/widgets/e-addressbook-view.c:1422
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "VCard olaraq qeyd et"
@@ -2645,8 +2652,8 @@ msgid "Success"
 msgstr "Qaynaqlar"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1710
-#: shell/e-storage.c:515
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1702
+#: shell/e-storage.c:520
 msgid "Unknown error"
 msgstr "Namə'lum xəta"
 
@@ -2655,7 +2662,7 @@ msgstr "Namə'lum xəta"
 msgid "Repository offline"
 msgstr "Xətdən Qopuq İşlə"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:505
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:510
 msgid "Permission denied"
 msgstr "Qadağandır"
 
@@ -2674,10 +2681,10 @@ msgid "Protocol not supported"
 msgstr "Əməliyyat dəstəklənmir"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:733 calendar/gui/calendar-model.c:1274
+#: calendar/gui/calendar-model.c:726 calendar/gui/calendar-model.c:1247
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:544
-#: camel/camel-service.c:580
+#: calendar/gui/e-calendar-table.c:461 camel/camel-service.c:598
+#: camel/camel-service.c:634
 msgid "Cancelled"
 msgstr "Ləğv Edildi"
 
@@ -2707,7 +2714,7 @@ msgid "Error removing list"
 msgstr "%s yüklənərkən xəta oldu"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1248
+#: addressbook/gui/widgets/e-addressbook-view.c:1297
 #, fuzzy
 msgid "Error removing card"
 msgstr ""
@@ -2986,8 +2993,8 @@ msgstr "Yazı növü ..."
 msgid "Print cards"
 msgstr "Təqvimi çap et"
 
-#: addressbook/printing/e-contact-print.c:1112
-#: addressbook/printing/e-contact-print.c:1134
+#: addressbook/printing/e-contact-print.c:1152
+#: addressbook/printing/e-contact-print.c:1174
 #, fuzzy
 msgid "Print card"
 msgstr "Təqvimi çap et"
@@ -2998,18 +3005,44 @@ msgstr "Təqvimi çap et"
 msgid "Print envelope"
 msgstr "Zərfi Çap Et"
 
-#: calendar/conduits/calendar/calendar-conduit.c:735
-#: calendar/conduits/todo/todo-conduit.c:548
+#: calendar/cal-util/cal-util.c:418 calendar/cal-util/cal-util.c:440
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:385 mail/message-list.c:652
+msgid "High"
+msgstr "Yüksək"
+
+#: calendar/cal-util/cal-util.c:420 calendar/cal-util/cal-util.c:442
+#: calendar/gui/calendar-model.c:1673
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:386 mail/message-list.c:651
+msgid "Normal"
+msgstr "Normal"
+
+#: calendar/cal-util/cal-util.c:422 calendar/cal-util/cal-util.c:444
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:387 mail/message-list.c:650
+msgid "Low"
+msgstr "Alçaq"
+
+#. An empty string is the same as 'None'.
+#: calendar/cal-util/cal-util.c:438
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:388
+msgid "Undefined"
+msgstr "Təsvirsiz"
+
+#: calendar/conduits/calendar/calendar-conduit.c:793
+#: calendar/conduits/todo/todo-conduit.c:564
 msgid "Error while communicating with calendar server"
 msgstr "Təqvim vericisi ilə bağlantı qurulurkən xəta oldu"
 
-#: calendar/conduits/calendar/calendar-conduit.c:839
-#: calendar/conduits/calendar/calendar-conduit.c:842
+#: calendar/conduits/calendar/calendar-conduit.c:896
+#: calendar/conduits/calendar/calendar-conduit.c:899
 msgid "Could not read pilot's Calendar application block"
 msgstr "Pilot Təqvim əlavələri bloku oxuna bilmədi"
 
-#: calendar/conduits/todo/todo-conduit.c:653
-#: calendar/conduits/todo/todo-conduit.c:656
+#: calendar/conduits/todo/todo-conduit.c:668
+#: calendar/conduits/todo/todo-conduit.c:671
 msgid "Could not read pilot's ToDo application block"
 msgstr "Pilot Ediləcəklər əlavələri bloku oxuna bilmədi"
 
@@ -3059,47 +3092,47 @@ msgstr "Alarm vermə xidməti"
 msgid "Factory for the alarm notification service"
 msgstr "Alarm vermə xidməti e'malatxanası"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:152
 #, fuzzy, c-format
 msgid "Notification about your appointment starting on %s and ending on %s"
 msgstr "%A %b %d %Y %H:%M'dəki iclas üçün bildiriş"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:156
 #, fuzzy, c-format
 msgid "Notification about your appointment starting on %s"
 msgstr "%A %b %d %Y %H:%M'dəki iclas üçün bildiriş"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:161
 #, fuzzy, c-format
 msgid "Notification about your appointment ending on %s"
 msgstr "%A %b %d %Y %H:%M'dəki iclas üçün bildiriş"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:165
 #, fuzzy
 msgid "Notification about your appointment"
 msgstr "%A %b %d %Y %H:%M'dəki iclas üçün bildiriş"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:172
 #, fuzzy, c-format
 msgid "Notification about your task starting on %s and ending on %s"
 msgstr "%A %b %d %Y %H:%M'dəki iclas üçün bildiriş"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:176
 #, fuzzy, c-format
 msgid "Notification about your task starting on %s"
 msgstr "%A %b %d %Y %H:%M'dəki iclas üçün bildiriş"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:181
 #, fuzzy, c-format
 msgid "Notification about your task ending on %s"
 msgstr "%A %b %d %Y %H:%M'dəki iclas üçün bildiriş"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:185
 #, fuzzy
 msgid "Notification about your task"
 msgstr "\"Evolution\" haqqında mə'lumat göstər"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:267
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "%A %b %d %Y %H:%M'də bildir"
 
@@ -3188,7 +3221,7 @@ msgstr "%A, %e %B %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: calendar/gui/calendar-commands.c:467
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1442
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1446
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -3199,17 +3232,17 @@ 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:399 calendar/gui/calendar-model.c:1001
-#: calendar/gui/e-calendar-table.c:307
+#: calendar/gui/calendar-model.c:399 calendar/gui/calendar-model.c:994
+#: calendar/gui/e-calendar-table.c:364
 msgid "Private"
 msgstr "Şəxsi"
 
-#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:1003
-#: calendar/gui/e-calendar-table.c:308
+#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:996
+#: calendar/gui/e-calendar-table.c:365
 msgid "Confidential"
 msgstr "Gizli"
 
-#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:306
+#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:363
 msgid "Public"
 msgstr "Ümumi"
 
@@ -3229,68 +3262,49 @@ msgstr "E"
 msgid "W"
 msgstr "Çərş."
 
-#: calendar/gui/calendar-model.c:538 calendar/gui/calendar-model.c:1183
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:652
-msgid "High"
-msgstr "Yüksək"
-
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1185
-#: calendar/gui/calendar-model.c:1700
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:651
-msgid "Normal"
-msgstr "Normal"
-
-#: calendar/gui/calendar-model.c:542 calendar/gui/calendar-model.c:1187
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:650
-msgid "Low"
-msgstr "Alçaq"
-
-#: calendar/gui/calendar-model.c:573 calendar/gui/calendar-model.c:1220
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/calendar-model.c:566 calendar/gui/calendar-model.c:1193
+#: calendar/gui/e-calendar-table.c:437
 #, fuzzy
 msgid "Free"
 msgstr "həftə"
 
-#: calendar/gui/calendar-model.c:575 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/calendar-model.c:568 calendar/gui/e-calendar-table.c:438
 #: calendar/gui/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr "Məşğul"
 
-#: calendar/gui/calendar-model.c:724 calendar/gui/calendar-model.c:1268
+#: calendar/gui/calendar-model.c:717 calendar/gui/calendar-model.c:1241
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:401
+#: calendar/gui/e-calendar-table.c:458
 msgid "Not Started"
 msgstr "Başlamayıb"
 
-#: calendar/gui/calendar-model.c:727 calendar/gui/calendar-model.c:1270
+#: calendar/gui/calendar-model.c:720 calendar/gui/calendar-model.c:1243
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:402
+#: calendar/gui/e-calendar-table.c:459
 msgid "In Progress"
 msgstr "İşləyir"
 
-#: calendar/gui/calendar-model.c:730 calendar/gui/calendar-model.c:1272
+#: calendar/gui/calendar-model.c:723 calendar/gui/calendar-model.c:1245
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-meeting-model.c:298
+#: calendar/gui/e-calendar-table.c:460 calendar/gui/e-meeting-model.c:298
 #: calendar/gui/e-meeting-model.c:321
 msgid "Completed"
 msgstr "Bitirmə Tarixi"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:915 e-util/e-time-utils.c:163
+#: calendar/gui/calendar-model.c:908 e-util/e-time-utils.c:163
 #: e-util/e-time-utils.c:354
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:918 e-util/e-time-utils.c:158
+#: calendar/gui/calendar-model.c:911 e-util/e-time-utils.c:158
 #: e-util/e-time-utils.c:363
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:923
+#: calendar/gui/calendar-model.c:916
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -3301,7 +3315,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:1087
+#: calendar/gui/calendar-model.c:1080
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3311,47 +3325,36 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1127
+#: calendar/gui/calendar-model.c:1120
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Faiz qiyməti ikisi də daxil olam üzərə 0 ilə 100 arasında olmalıdır"
 
-#: calendar/gui/calendar-model.c:1168
-msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
-msgstr "Üstünlük 'Yüksək', 'Normal', 'Alçaq' və ya 'Təsvirsiz' ola bilər."
-
-#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1181
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:331
-msgid "Undefined"
-msgstr "Təsvirsiz"
-
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1266 calendar/gui/dialogs/meeting-page.c:332
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1444
+#: calendar/gui/calendar-model.c:1239 calendar/gui/dialogs/meeting-page.c:332
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1446
 #: mail/mail-accounts.c:143 mail/mail-accounts.c:390
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:50
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:203
-#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
-#: widgets/misc/e-dateedit.c:1428 widgets/misc/e-dateedit.c:1543
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:453
+#: widgets/misc/e-dateedit.c:1453 widgets/misc/e-dateedit.c:1568
 msgid "None"
 msgstr "Yoxdur"
 
-#: calendar/gui/calendar-model.c:1702
+#: calendar/gui/calendar-model.c:1675
 msgid "Recurring"
 msgstr "Təkrarlayan"
 
-#: calendar/gui/calendar-model.c:1704
+#: calendar/gui/calendar-model.c:1677
 msgid "Assigned"
 msgstr "Vəzifələndirilmiş"
 
-#: calendar/gui/calendar-model.c:1710 calendar/gui/e-meeting-model.c:270
+#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:270
 #: calendar/gui/e-meeting-model.c:280 calendar/gui/e-meeting-model.c:506
 #: calendar/gui/e-meeting-model.c:702
 msgid "Yes"
 msgstr "Bəli"
 
-#: calendar/gui/calendar-model.c:1710 calendar/gui/e-meeting-model.c:282
+#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:282
 #: calendar/gui/e-meeting-model.c:703
 msgid "No"
 msgstr "Xeyr"
@@ -3393,42 +3396,42 @@ msgstr "Şərh daxil edən"
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/component-factory.c:62 my-evolution/my-evolution.glade.h:6
+#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:6
 #: shell/e-local-storage.c:172 shell/e-shortcuts.c:1056
 msgid "Calendar"
 msgstr "Təqvim"
 
-#: calendar/gui/component-factory.c:63
+#: calendar/gui/component-factory.c:64
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/component-factory.c:67 calendar/gui/print.c:1719
-#: my-evolution/e-summary-tasks.c:215 my-evolution/e-summary-tasks.c:231
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1723
+#: my-evolution/e-summary-tasks.c:237 my-evolution/e-summary-tasks.c:253
 #: shell/e-local-storage.c:178 shell/e-shortcuts.c:1059
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Vəzifə"
 
-#: calendar/gui/component-factory.c:68
+#: calendar/gui/component-factory.c:69
 #, fuzzy
 msgid "Folder containing to-do items"
 msgstr "Məktublaşma Qrupundakı VFolder"
 
-#: calendar/gui/component-factory.c:593 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:581 ui/evolution-calendar.xml.h:7
 msgid "Create a new appointment"
 msgstr "Yeni bir iclas yarat"
 
-#: calendar/gui/component-factory.c:594 calendar/gui/e-day-view.c:3420
+#: calendar/gui/component-factory.c:582 calendar/gui/e-day-view.c:3422
 #, fuzzy
 msgid "New _Appointment"
 msgstr "Yeni İclas"
 
-#: calendar/gui/component-factory.c:599 ui/evolution-calendar.xml.h:8
+#: calendar/gui/component-factory.c:587 ui/evolution-calendar.xml.h:8
 #: ui/evolution-tasks.xml.h:5
 msgid "Create a new task"
 msgstr "Yeni bir vəzifə yarat"
 
-#: calendar/gui/component-factory.c:600
+#: calendar/gui/component-factory.c:588
 #, fuzzy
 msgid "New _Task"
 msgstr "Yeni Vəzifə"
@@ -3510,105 +3513,126 @@ msgstr "saat"
 msgid "minutes"
 msgstr "dəqiqə"
 
-#: calendar/gui/dialogs/alarm-page.c:303
+#: calendar/gui/dialogs/alarm-page.c:307
 #, fuzzy, c-format
 msgid "%d days"
 msgstr "%d gün"
 
-#: calendar/gui/dialogs/alarm-page.c:305
+#: calendar/gui/dialogs/alarm-page.c:310
 #, fuzzy
 msgid "1 day"
 msgstr "1 gün"
 
-#: calendar/gui/dialogs/alarm-page.c:308
+#: calendar/gui/dialogs/alarm-page.c:315
 #, fuzzy, c-format
 msgid "%d weeks"
 msgstr "%d həftə"
 
-#: calendar/gui/dialogs/alarm-page.c:310
+#: calendar/gui/dialogs/alarm-page.c:318
 #, fuzzy
 msgid "1 week"
 msgstr "2 həftə"
 
-#: calendar/gui/dialogs/alarm-page.c:313
+#: calendar/gui/dialogs/alarm-page.c:323
 #, fuzzy, c-format
 msgid "%d hours"
 msgstr "%d saat"
 
-#: calendar/gui/dialogs/alarm-page.c:315
+#: calendar/gui/dialogs/alarm-page.c:326
 #, fuzzy
 msgid "1 hour"
 msgstr "1 saat"
 
-#: calendar/gui/dialogs/alarm-page.c:318
+#: calendar/gui/dialogs/alarm-page.c:331
 #, fuzzy, c-format
 msgid "%d minutes"
 msgstr "%d dəqiqə"
 
-#: calendar/gui/dialogs/alarm-page.c:320
+#: calendar/gui/dialogs/alarm-page.c:334
 #, fuzzy
 msgid "1 minute"
 msgstr "1 dəqiqə"
 
-#: calendar/gui/dialogs/alarm-page.c:323
+#: calendar/gui/dialogs/alarm-page.c:339
 #, fuzzy, c-format
 msgid "%d seconds"
 msgstr "%d saniyə"
 
-#: calendar/gui/dialogs/alarm-page.c:325
+#: calendar/gui/dialogs/alarm-page.c:342
 #, fuzzy
 msgid "1 second"
 msgstr "1 saniyə"
 
-#: calendar/gui/dialogs/alarm-page.c:350
+#: calendar/gui/dialogs/alarm-page.c:373
 #: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "Səs çal"
 
-#: calendar/gui/dialogs/alarm-page.c:354
+#: calendar/gui/dialogs/alarm-page.c:377
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 #, fuzzy
 msgid "Display a message"
 msgstr "Bütün ismarıc başlıqlarını göstər"
 
-#: calendar/gui/dialogs/alarm-page.c:358
+#: calendar/gui/dialogs/alarm-page.c:381
 msgid "Send an email"
 msgstr "ePoçt göndər"
 
-#: calendar/gui/dialogs/alarm-page.c:362
+#: calendar/gui/dialogs/alarm-page.c:385
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "Proqramı işə sal"
 
-#: calendar/gui/dialogs/alarm-page.c:368 calendar/gui/dialogs/alarm-page.c:404
-#: calendar/gui/e-meeting-model.c:226 calendar/gui/e-meeting-model.c:261
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:674
-#: calendar/gui/e-meeting-model.c:690
-#: camel/providers/smtp/camel-smtp-transport.c:224
-#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
-msgid "Unknown"
-msgstr "Namə'lum"
-
-#: calendar/gui/dialogs/alarm-page.c:380
+#: calendar/gui/dialogs/alarm-page.c:391
 #, fuzzy
-msgid "before start of appointment"
+msgid "Unknown action to be performed"
+msgstr "Namə'lum xəta"
+
+#: calendar/gui/dialogs/alarm-page.c:403
+#, fuzzy, c-format
+msgid "%s %s before the start of the appointment"
 msgstr "iclasın başlanğıcından əvvəl"
 
-#: calendar/gui/dialogs/alarm-page.c:383
-#, fuzzy
-msgid "after start of appointment"
-msgstr "iclasın başlanğıcından sonra"
+#: calendar/gui/dialogs/alarm-page.c:406
+#, fuzzy, c-format
+msgid "%s %s after the start of the appointment"
+msgstr "iclasın başlanğıcından əvvəl"
 
-#: calendar/gui/dialogs/alarm-page.c:393
-#, fuzzy
-msgid "before end of appointment"
-msgstr "iclas qurtarandan əvvəl"
+#: calendar/gui/dialogs/alarm-page.c:411
+#, fuzzy, c-format
+msgid "%s at the start of the appointment"
+msgstr "iclasın başlanğıcından əvvəl"
 
-#: calendar/gui/dialogs/alarm-page.c:396
-#, fuzzy
-msgid "after end of appointment"
+#: calendar/gui/dialogs/alarm-page.c:420
+#, fuzzy, c-format
+msgid "%s %s before the end of the appointment"
+msgstr "iclasın başlanğıcından əvvəl"
+
+#: calendar/gui/dialogs/alarm-page.c:423
+#, fuzzy, c-format
+msgid "%s %s after the end of the appointment"
 msgstr "iclas qurtarandan sonra"
 
+#: calendar/gui/dialogs/alarm-page.c:428
+#, fuzzy, c-format
+msgid "%s at the end of the appointment"
+msgstr "iclas qurtarandan sonra"
+
+#: calendar/gui/dialogs/alarm-page.c:439
+#, fuzzy, c-format
+msgid "%s at an unknown time"
+msgstr "Namə'lum xəta"
+
+#: calendar/gui/dialogs/alarm-page.c:445
+#, fuzzy, c-format
+msgid "%s at %s"
+msgstr "%s verici %s"
+
+#: calendar/gui/dialogs/alarm-page.c:452
+#, c-format
+msgid "%s for an unknown trigger type"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 #, fuzzy
@@ -3963,58 +3987,58 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:159 calendar/gui/print.c:2128
+#: calendar/gui/dialogs/comp-editor-util.c:167 calendar/gui/print.c:2132
 msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:163 calendar/gui/print.c:2132
+#: calendar/gui/dialogs/comp-editor-util.c:171 calendar/gui/print.c:2136
 #, fuzzy
 msgid " (Completed "
 msgstr "Bitirmə Tarixi"
 
-#: calendar/gui/dialogs/comp-editor-util.c:165 calendar/gui/print.c:2134
+#: calendar/gui/dialogs/comp-editor-util.c:173 calendar/gui/print.c:2138
 #, fuzzy
 msgid "Completed "
 msgstr "Bitirmə Tarixi"
 
-#: calendar/gui/dialogs/comp-editor-util.c:170 calendar/gui/print.c:2139
+#: calendar/gui/dialogs/comp-editor-util.c:178 calendar/gui/print.c:2143
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2141
+#: calendar/gui/dialogs/comp-editor-util.c:180 calendar/gui/print.c:2145
 #, fuzzy
 msgid "Due "
 msgstr "Uyğun Tarix"
 
-#: calendar/gui/dialogs/comp-editor.c:515
+#: calendar/gui/dialogs/comp-editor.c:521
 msgid "Edit Appointment"
 msgstr "İclası düzəlt"
 
-#: calendar/gui/dialogs/comp-editor.c:520
+#: calendar/gui/dialogs/comp-editor.c:526
 #, c-format
 msgid "Appointment - %s"
 msgstr "İclas - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:523
+#: calendar/gui/dialogs/comp-editor.c:529
 #, c-format
 msgid "Task - %s"
 msgstr "Vəzifə - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:526
+#: calendar/gui/dialogs/comp-editor.c:532
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Jurnal üzvü - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:540
+#: calendar/gui/dialogs/comp-editor.c:546
 msgid "No summary"
 msgstr "Mündəricat yoxdur"
 
-#: calendar/gui/dialogs/comp-editor.c:950 mail/mail-callbacks.c:1662
+#: calendar/gui/dialogs/comp-editor.c:952 mail/mail-callbacks.c:1671
 #: mail/mail-display.c:100
 msgid "Overwrite file?"
 msgstr "Faylının üsütünə yazım mı?"
 
-#: calendar/gui/dialogs/comp-editor.c:954 mail/mail-callbacks.c:1668
+#: calendar/gui/dialogs/comp-editor.c:956 mail/mail-callbacks.c:1677
 #: mail/mail-display.c:104
 msgid ""
 "A file by that name already exists.\n"
@@ -4023,53 +4047,53 @@ msgstr ""
 "Eyni adlı bir fayl onsuz da vardır.\n"
 "Üstünə yazım mı?"
 
-#: calendar/gui/dialogs/comp-editor.c:1017 ui/evolution-comp-editor.xml.h:13
+#: calendar/gui/dialogs/comp-editor.c:1019 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "Fərqli Qeyd Et ..."
 
-#: calendar/gui/dialogs/comp-editor.c:1170
+#: calendar/gui/dialogs/comp-editor.c:1172
 msgid "Unable to obtain current version!"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:90
+#: calendar/gui/dialogs/delete-comp.c:91
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Bu  `%s' görüşünü həqiqətən də silmək istəyirsiniz?"
 
-#: calendar/gui/dialogs/delete-comp.c:93
+#: calendar/gui/dialogs/delete-comp.c:94
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Bu adsız görüşü həqiqətən də silmək istəyirsiniz?"
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:100
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Bu `%s' vəzifəsini həqiqətən də silmək istəyirsiniz?"
 
-#: calendar/gui/dialogs/delete-comp.c:102
+#: calendar/gui/dialogs/delete-comp.c:103
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Bu adsız vəzifəsini həqiqətən də silmək istəyirsiniz?"
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:109
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Bu `%s' jurnal girişini həqiqətən də silmək istəyirsiniz?"
 
-#: calendar/gui/dialogs/delete-comp.c:111
+#: calendar/gui/dialogs/delete-comp.c:112
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Bu adsız jurnal girişini həqiqətən də silmək istəyirsiniz?"
 
-#: calendar/gui/dialogs/delete-comp.c:126
+#: calendar/gui/dialogs/delete-comp.c:127
 #, fuzzy, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Bu  `%s' görüşünü həqiqətən də silmək istəyirsiniz?"
 
-#: calendar/gui/dialogs/delete-comp.c:131
+#: calendar/gui/dialogs/delete-comp.c:132
 #, fuzzy, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Bu `%s' vəzifəsini həqiqətən də silmək istəyirsiniz?"
 
-#: calendar/gui/dialogs/delete-comp.c:136
+#: calendar/gui/dialogs/delete-comp.c:137
 #, fuzzy, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Bu `%s' jurnal girişini həqiqətən də silmək istəyirsiniz?"
@@ -4271,7 +4295,7 @@ msgstr "Hal"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:18
-#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:85
+#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:86
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Növ"
@@ -4296,8 +4320,8 @@ msgstr "Başqalarını _Dəvət Et ..."
 msgid "_Other Organizer"
 msgstr "Təşkilatçı:"
 
-#: calendar/gui/dialogs/recurrence-page.c:422 calendar/gui/print.c:1851
-#: calendar/gui/print.c:1853 calendar/gui/print.c:1854
+#: calendar/gui/dialogs/recurrence-page.c:422 calendar/gui/print.c:1855
+#: calendar/gui/print.c:1857 calendar/gui/print.c:1858
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
@@ -4421,7 +4445,7 @@ msgid "Progress"
 msgstr "Gedişat"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:910
+#: my-evolution/e-summary-preferences.c:949
 msgid "URL:"
 msgstr "URL:"
 
@@ -4441,7 +4465,7 @@ msgstr "Vəzifələndirilmiş"
 
 #: calendar/gui/dialogs/task-page.glade.h:4
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:28
 msgid "Description:"
 msgstr "İzah :"
 
@@ -4457,109 +4481,109 @@ msgstr "_Gizli"
 msgid "_Due Date:"
 msgstr "_Bu tarixə qədər :"
 
-#: calendar/gui/e-calendar-table.c:350
+#: calendar/gui/e-calendar-table.c:407
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:351
+#: calendar/gui/e-calendar-table.c:408
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:409
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:410
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:411
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:412
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:356
+#: calendar/gui/e-calendar-table.c:413
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:357
+#: calendar/gui/e-calendar-table.c:414
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:358
+#: calendar/gui/e-calendar-table.c:415
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:359
+#: calendar/gui/e-calendar-table.c:416
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:360
+#: calendar/gui/e-calendar-table.c:417
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3441
-#: calendar/gui/e-week-view.c:3288 mail/folder-browser.c:1336
+#: calendar/gui/e-calendar-table.c:914 calendar/gui/e-day-view.c:3443
+#: calendar/gui/e-week-view.c:3296 mail/folder-browser.c:1371
 #: shell/e-shortcuts-view.c:385
 msgid "_Open"
 msgstr "_Aç"
 
-#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3450
-#: calendar/gui/e-week-view.c:3297 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:918 calendar/gui/e-day-view.c:3452
+#: calendar/gui/e-week-view.c:3305 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:856 calendar/gui/e-day-view.c:3452
-#: calendar/gui/e-week-view.c:3299 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:920 calendar/gui/e-day-view.c:3454
+#: calendar/gui/e-week-view.c:3307 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:14
 msgid "_Copy"
 msgstr "_Köçürt"
 
-#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3427
-#: calendar/gui/e-day-view.c:3454 calendar/gui/e-week-view.c:3275
-#: calendar/gui/e-week-view.c:3301 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:922 calendar/gui/e-day-view.c:3429
+#: calendar/gui/e-day-view.c:3456 calendar/gui/e-week-view.c:3283
+#: calendar/gui/e-week-view.c:3309 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:40 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:17
 msgid "_Paste"
 msgstr "_Yapışdır"
 
-#: calendar/gui/e-calendar-table.c:863
+#: calendar/gui/e-calendar-table.c:927
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "İşarətləmə qurtadı"
 
-#: calendar/gui/e-calendar-table.c:865
+#: calendar/gui/e-calendar-table.c:929
 #, fuzzy
 msgid "_Delete this Task"
 msgstr "Vəzifəni sil"
 
-#: calendar/gui/e-calendar-table.c:868
+#: calendar/gui/e-calendar-table.c:932
 #, fuzzy
 msgid "_Mark Tasks as Complete"
 msgstr "İşarətləmə qurtadı"
 
-#: calendar/gui/e-calendar-table.c:870
+#: calendar/gui/e-calendar-table.c:934
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Bu vəzifəni sil"
 
-#: calendar/gui/e-calendar-table.c:1130
+#: calendar/gui/e-calendar-table.c:1194
 #: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Click to add a task"
@@ -4569,8 +4593,8 @@ msgstr "Vəzifə əlavə etmək üçün buraya tıqla"
 msgid "Alarms"
 msgstr "Alarm"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:702
-#: camel/camel-filter-driver.c:819
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:718
+#: camel/camel-filter-driver.c:834
 msgid "Complete"
 msgstr "Qurtar"
 
@@ -4601,8 +4625,8 @@ 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:30 shell/e-shortcuts.c:1050
-#: shell/e-storage-set-view.c:1424 shell/e-summary-storage.c:80
+#: my-evolution/component-factory.c:45 shell/e-shortcuts.c:1050
+#: shell/e-storage-set-view.c:1420 shell/e-summary-storage.c:80
 msgid "Summary"
 msgstr "Mündəricat"
 
@@ -4623,7 +4647,7 @@ 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:285 calendar/gui/e-day-view.c:1374
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1458
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -4635,304 +4659,321 @@ 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:608 calendar/gui/e-week-view.c:344
-#: calendar/gui/print.c:765
+#: calendar/gui/e-day-view.c:608 calendar/gui/e-week-view.c:345
+#: calendar/gui/print.c:769
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:347
-#: calendar/gui/print.c:767
+#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:348
+#: calendar/gui/print.c:771
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3422 calendar/gui/e-week-view.c:3270
+#: calendar/gui/e-day-view.c:3424 calendar/gui/e-week-view.c:3278
 #, fuzzy
 msgid "New All Day _Event"
 msgstr "Yeni Bütün Gün Hadisələri"
 
-#: calendar/gui/e-day-view.c:3432 calendar/gui/e-week-view.c:3280
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3288
 #: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "_Bugünə Get"
 
-#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3282
+#: calendar/gui/e-day-view.c:3436 calendar/gui/e-week-view.c:3290
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "Tarixə Get..."
 
-#: calendar/gui/e-day-view.c:3443 calendar/gui/e-week-view.c:3290
+#: calendar/gui/e-day-view.c:3445 calendar/gui/e-week-view.c:3298
 #, fuzzy
 msgid "_Delete this Appointment"
 msgstr "Bu İclası sil"
 
-#: calendar/gui/e-day-view.c:3462 calendar/gui/e-week-view.c:3315
+#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3323
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "Bu hadisənin daşına bilməsinə imkan ver"
 
-#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3317
+#: calendar/gui/e-day-view.c:3466 calendar/gui/e-week-view.c:3325
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "Bu Hadisəni sil"
 
-#: calendar/gui/e-day-view.c:3466 calendar/gui/e-week-view.c:3319
+#: calendar/gui/e-day-view.c:3468 calendar/gui/e-week-view.c:3327
 #, fuzzy
 msgid "Delete _All Occurrences"
 msgstr "Bütün Hadisələri Sil"
 
+#: calendar/gui/e-itip-control.c:469
+msgid "Meeting begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:474
+msgid "Task begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:479
+#, fuzzy
+msgid "Free/Busy info begins: <b>"
+msgstr "İstənən Mə'lumatlar"
+
+#: calendar/gui/e-itip-control.c:483
+msgid "Begins: <b>"
+msgstr ""
+
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:677
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:664
+#: calendar/gui/e-itip-control.c:692
 #, c-format
 msgid "<b>Summary:</b> %s<br><br>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:664
+#: calendar/gui/e-itip-control.c:692
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:674
+#: calendar/gui/e-itip-control.c:702
 #, fuzzy, c-format
 msgid "<b>Description:</b> %s"
 msgstr "İzah :"
 
-#: calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:737
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:738
 #, fuzzy
 msgid "Meeting Information"
 msgstr "Arzuya Bağlı Mə'lumatlar"
 
-#: calendar/gui/e-itip-control.c:715
+#: calendar/gui/e-itip-control.c:742
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:716
+#: calendar/gui/e-itip-control.c:743
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "Görüşü Ləğv Et"
 
-#: calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-itip-control.c:747
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:721
+#: calendar/gui/e-itip-control.c:748
 #, fuzzy
 msgid "Meeting Update"
 msgstr "İclas sonlanma saatı :"
 
-#: calendar/gui/e-itip-control.c:725
+#: calendar/gui/e-itip-control.c:752
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:726
+#: calendar/gui/e-itip-control.c:753
 #, fuzzy
 msgid "Meeting Update Request"
 msgstr "Görü İs_təyi (FIXME)"
 
-#: calendar/gui/e-itip-control.c:730
+#: calendar/gui/e-itip-control.c:757
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "_Bu ePoçt ünvanıdır"
 
-#: calendar/gui/e-itip-control.c:731
+#: calendar/gui/e-itip-control.c:758
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "Görüşü Ləğv Et"
 
-#: calendar/gui/e-itip-control.c:735
+#: calendar/gui/e-itip-control.c:762
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:736
+#: calendar/gui/e-itip-control.c:763
 #, fuzzy
 msgid "Meeting Cancellation"
 msgstr "Fayl seç"
 
-#: calendar/gui/e-itip-control.c:740 calendar/gui/e-itip-control.c:788
-#: calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:767 calendar/gui/e-itip-control.c:815
+#: calendar/gui/e-itip-control.c:848
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:741
+#: calendar/gui/e-itip-control.c:768
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "İsmarıcı Düzəlt"
 
-#: calendar/gui/e-itip-control.c:758
+#: calendar/gui/e-itip-control.c:785
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:759
+#: calendar/gui/e-itip-control.c:786
 #, fuzzy
 msgid "Task Information"
 msgstr "Mə'lumat"
 
-#: calendar/gui/e-itip-control.c:763
+#: calendar/gui/e-itip-control.c:790
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:791
 #, fuzzy
 msgid "Task Proposal"
 msgstr "Vəzifə Taxtası"
 
-#: calendar/gui/e-itip-control.c:768
+#: calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:769
+#: calendar/gui/e-itip-control.c:796
 #, fuzzy
 msgid "Task Update"
 msgstr "sonra idi"
 
-#: calendar/gui/e-itip-control.c:773
+#: calendar/gui/e-itip-control.c:800
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:774
+#: calendar/gui/e-itip-control.c:801
 #, fuzzy
 msgid "Task Update Request"
 msgstr "Vəzifə So_rğusu (FIXME)"
 
-#: calendar/gui/e-itip-control.c:778
+#: calendar/gui/e-itip-control.c:805
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "_Bu ePoçt ünvanıdır"
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:806
 #, fuzzy
 msgid "Task Reply"
 msgstr "Cavab ver"
 
-#: calendar/gui/e-itip-control.c:783
+#: calendar/gui/e-itip-control.c:810
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:784
+#: calendar/gui/e-itip-control.c:811
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "Görüşü Ləğv Et"
 
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:816
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "Təqvim İsmarıcı"
 
-#: calendar/gui/e-itip-control.c:806
+#: calendar/gui/e-itip-control.c:833
 #, fuzzy, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "İstənən Mə'lumatlar"
 
-#: calendar/gui/e-itip-control.c:807
+#: calendar/gui/e-itip-control.c:834
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "İstənən Mə'lumatlar"
 
-#: calendar/gui/e-itip-control.c:811
+#: calendar/gui/e-itip-control.c:838
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:812
+#: calendar/gui/e-itip-control.c:839
 #, fuzzy
 msgid "Free/Busy Request"
 msgstr "Sərbəst/məşğul URL"
 
-#: calendar/gui/e-itip-control.c:816
+#: calendar/gui/e-itip-control.c:843
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "_Bu ePoçt ünvanıdır"
 
-#: calendar/gui/e-itip-control.c:817
+#: calendar/gui/e-itip-control.c:844
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "Sərbəst/məşğul URL"
 
-#: calendar/gui/e-itip-control.c:822
+#: calendar/gui/e-itip-control.c:849
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "Əvvəlki İsmarıc"
 
-#: calendar/gui/e-itip-control.c:889
+#: calendar/gui/e-itip-control.c:916
 #, 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:908
+#: calendar/gui/e-itip-control.c:935
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:936 calendar/gui/e-itip-control.c:942
+#: calendar/gui/e-itip-control.c:963 calendar/gui/e-itip-control.c:969
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1088
 #, fuzzy
 msgid "Calendar file could not be updated!\n"
 msgstr "Ox yüklənə bilmədi\n"
 
-#: calendar/gui/e-itip-control.c:1063
+#: calendar/gui/e-itip-control.c:1090
 #, fuzzy
 msgid "Update complete\n"
 msgstr "Bitirmə Tarixi:"
 
-#: calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.c:1134
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1142
 msgid "Attendee status ould not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1144
 #, fuzzy
 msgid "Attendee status updated\n"
 msgstr "Ziyarətçilərin ünvanları"
 
-#: calendar/gui/e-itip-control.c:1119
+#: calendar/gui/e-itip-control.c:1146
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1174
 #, fuzzy
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "Təqvim faylını aça bilmirəm!\n"
 
-#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-itip-control.c:1176
 #, fuzzy
 msgid "Removal Complete"
 msgstr "% _Qurtardı:"
 
-#: calendar/gui/e-itip-control.c:1181 calendar/gui/e-itip-control.c:1216
+#: calendar/gui/e-itip-control.c:1208 calendar/gui/e-itip-control.c:1242
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "Göndərilmə tarixi"
 
-#: calendar/gui/e-itip-control.c:1183 calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1210 calendar/gui/e-itip-control.c:1246
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1380
+#: calendar/gui/e-itip-control.c:1406
 msgid "Unable to find any of your identities in the attendees list!\n"
 msgstr ""
 
@@ -4995,6 +5036,14 @@ msgstr "Kağız qaynağı :"
 msgid "Room"
 msgstr ""
 
+#: calendar/gui/e-meeting-model.c:226 calendar/gui/e-meeting-model.c:261
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:674
+#: calendar/gui/e-meeting-model.c:690
+#: camel/providers/smtp/camel-smtp-transport.c:224
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
+msgid "Unknown"
+msgstr "Namə'lum"
+
 #: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
 #: calendar/gui/e-meeting-model.c:686
 msgid "Chair"
@@ -5052,14 +5101,14 @@ msgstr "İşləyir"
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:472
-#: calendar/gui/e-meeting-time-sel.c:1936
+#: calendar/gui/e-meeting-time-sel.c:1937
 msgid "%A, %B %d, %Y"
 msgstr "%a %B %d %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:476
-#: calendar/gui/e-meeting-time-sel.c:1964 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:1965 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:345
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
@@ -5067,7 +5116,7 @@ msgstr "%a %m/%d/%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:480 e-util/e-time-utils.c:221
-#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1552
+#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1577
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
@@ -5145,17 +5194,17 @@ msgstr "`%s' dakı (dəki) vəzifələr yüklənə bilmədi"
 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-week-view.c:3268 calendar/gui/e-week-view.c:3306
+#: calendar/gui/e-week-view.c:3276 calendar/gui/e-week-view.c:3314
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "Yeni İclas ..."
 
-#: calendar/gui/gnome-cal.c:1318
+#: calendar/gui/gnome-cal.c:1319
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "`%s'da(də) qovluq yarada bilmədim"
 
-#: calendar/gui/gnome-cal.c:1329
+#: calendar/gui/gnome-cal.c:1330
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "`%s' i(ı) açmağa yarayan yol dəstəklənmir"
@@ -5226,205 +5275,205 @@ msgstr ""
 msgid "Could not create the component editor factory"
 msgstr "Alarm vermə xidməti e'malatxanası yaradıla bilmir"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "1st"
 msgstr "1.nci"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "2nd"
 msgstr "2.nci"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "3rd"
 msgstr "3.ncü"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "4th"
 msgstr "4.ncü"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "5th"
 msgstr "5.nci"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "6th"
 msgstr "6.ncı"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "7th"
 msgstr "7.nci"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "8th"
 msgstr "8.nci"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "9th"
 msgstr "9.ncu"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "10th"
 msgstr "10.ncu"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "11th"
 msgstr "11.nci"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "12th"
 msgstr "12.nci"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "13th"
 msgstr "13.ncü"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "14th"
 msgstr "14.ncü"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "15th"
 msgstr "15.nci"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "16th"
 msgstr "16.ncı"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "17th"
 msgstr "17.nci"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "18th"
 msgstr "18.nci"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "19th"
 msgstr "19.ncu"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "20th"
 msgstr "20.nci"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "21st"
 msgstr "21.nci"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "22nd"
 msgstr "22.nci"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "23rd"
 msgstr "23.ncü"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "24th"
 msgstr "24.ncü"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "25th"
 msgstr "25.nci"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "26th"
 msgstr "26.ncı"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "27th"
 msgstr "27.nci"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "28th"
 msgstr "28.nci"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "29th"
 msgstr "29.ncu"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "30th"
 msgstr "39.ncu"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:432
 msgid "31st"
 msgstr "31.nci"
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "Su"
 msgstr "Baz."
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "Mo"
 msgstr "B.ei"
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "Tu"
 msgstr "Ç.a"
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "We"
 msgstr "Çə"
 
-#: calendar/gui/print.c:497
+#: calendar/gui/print.c:500
 msgid "Th"
 msgstr "C.a"
 
-#: calendar/gui/print.c:497
+#: calendar/gui/print.c:500
 msgid "Fr"
 msgstr "Cümə"
 
-#: calendar/gui/print.c:497
+#: calendar/gui/print.c:500
 msgid "Sa"
 msgstr "Şn"
 
 #. Day
-#: calendar/gui/print.c:1827
+#: calendar/gui/print.c:1831
 #, fuzzy
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Hazırkı gün ( %a %b %d %Y )"
 
-#: calendar/gui/print.c:1846 calendar/gui/print.c:1850
+#: calendar/gui/print.c:1850 calendar/gui/print.c:1854
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1847
+#: calendar/gui/print.c:1851
 msgid "%a %d %Y"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1858
+#: calendar/gui/print.c:1862
 #, fuzzy, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Hazırkı həftə ( %s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1866
+#: calendar/gui/print.c:1870
 #, fuzzy
 msgid "Selected month (%b %Y)"
 msgstr "Hazırkı ay ( %b %Y )"
 
 #. Year
-#: calendar/gui/print.c:1873
+#: calendar/gui/print.c:1877
 #, fuzzy
 msgid "Selected year (%Y)"
 msgstr "Hazırkı il ( %Y )"
 
-#: calendar/gui/print.c:2214
+#: calendar/gui/print.c:2221
 msgid "Print Calendar"
 msgstr "Təqvimi çap et"
 
-#: calendar/gui/print.c:2302 calendar/gui/print.c:2394
-#: mail/mail-callbacks.c:2071 my-evolution/e-summary.c:551
+#: calendar/gui/print.c:2312 calendar/gui/print.c:2404
+#: mail/mail-callbacks.c:2080 my-evolution/e-summary.c:607
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
 msgstr "Çap Etmə nümayişi"
 
-#: calendar/gui/print.c:2331
+#: calendar/gui/print.c:2341
 #, fuzzy
 msgid "Print Item"
 msgstr "Bu üzvü çap et"
 
-#: calendar/gui/print.c:2412
+#: calendar/gui/print.c:2422
 msgid "Print Setup"
 msgstr "Çap Qurğuları"
 
@@ -5619,65 +5668,82 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr ""
 
-#: camel/camel-disco-store.c:305
+#: camel/camel-disco-store.c:336
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
+#: camel/camel-filter-driver.c:549 camel/camel-filter-driver.c:558
 msgid "Syncing folders"
 msgstr "Qovluqlar sinxronlaşdırılır"
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:659
 msgid "Unable to open spool folder"
 msgstr "Növbə faylını aça bilmədim"
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:668
 msgid "Unable to process spool folder"
 msgstr "Növbə faylını işlədə bilmirəm"
 
-#: camel/camel-filter-driver.c:667
+#: camel/camel-filter-driver.c:683
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "%d (%d%%) İsmarıcı alınır"
 
-#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
+#: camel/camel-filter-driver.c:687 camel/camel-filter-driver.c:700
 #, fuzzy, c-format
 msgid "Failed on message %d"
 msgstr "Bacarılmayan İsmarıc %d"
 
-#: camel/camel-filter-driver.c:672
+#: camel/camel-filter-driver.c:688
 msgid "Cannot open message"
 msgstr "İsmarıc açıla bilmir"
 
-#: camel/camel-filter-driver.c:698 camel/camel-filter-driver.c:814
+#: camel/camel-filter-driver.c:714 camel/camel-filter-driver.c:829
 msgid "Syncing folder"
 msgstr "Qovluqlar sinxronlaşdırılır"
 
-#: camel/camel-filter-driver.c:770
+#: camel/camel-filter-driver.c:786
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "%d İsmarıcın %d qədərə alınır"
 
-#: camel/camel-filter-driver.c:775 camel/camel-filter-driver.c:793
+#: camel/camel-filter-driver.c:791 camel/camel-filter-driver.c:809
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "%d nin(nın) %d ismarıcında iflas etdim"
 
-#: camel/camel-filter-driver.c:900
+#: camel/camel-filter-driver.c:918
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Alıcı süzgəc xətası: %s: %s"
 
-#: camel/camel-filter-driver.c:906
+#: camel/camel-filter-driver.c:924
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "İşə salıcı süzgəc xətası: %s: %s"
 
-#: camel/camel-filter-search.c:479 camel/camel-filter-search.c:486
+#: camel/camel-filter-search.c:494 camel/camel-filter-search.c:501
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "İşə salıcı süzgəc axtarışı xətası: %s: %s"
 
+#: camel/camel-folder.c:472
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1039
+#, fuzzy, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr ""
+"İşə salıcı axtarış ifadəsi darama xətası:%s:\n"
+"%s"
+
+#: camel/camel-folder.c:1219
+#, fuzzy
+msgid "Moving messages"
+msgstr "İsmarıclar köçürülür"
+
 #: camel/camel-folder-search.c:333
 #, c-format
 msgid ""
@@ -5705,7 +5771,7 @@ msgstr "(hamısını yoxla) tək düzgün nəticə istəyir"
 msgid "Performing query on unknown header: %s"
 msgstr "Namə'lum başlıqda sorǧu aparılır: %s"
 
-#: camel/camel-folder-search.c:747 camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:748 camel/camel-folder-search.c:792
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Cismdə hökmsüz yazı, kəlimə xaric"
 
@@ -5804,81 +5870,81 @@ 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-pgp-context.c:193
+#: camel/camel-pgp-context.c:191
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "%s üçün %s parol kalimanizi lürfən girin"
 
-#: camel/camel-pgp-context.c:196
+#: camel/camel-pgp-context.c:194
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "Lütfən %s parol kəlimənizi girin"
 
-#: camel/camel-pgp-context.c:518
+#: camel/camel-pgp-context.c:525
 #, fuzzy
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr "İsmarıc göndrərilə bilmədi: alıcı bildirilməyib."
 
-#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:532 camel/camel-pgp-context.c:706
 #, fuzzy
 msgid "Cannot sign this message: no password provided"
 msgstr "İsmarıc göndrərilə bilmədi: göndərənin ünvanı hökmsüzdür."
 
-#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:538 camel/camel-pgp-context.c:712
 #, fuzzy, c-format
 msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "GPG/PGP proqramına boru yaradıla bilmir. %s"
 
-#: camel/camel-pgp-context.c:693
+#: camel/camel-pgp-context.c:699
 #, fuzzy
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr "İsmarıc göndrərilə bilmədi: alıcı bildirilməyib."
 
-#: camel/camel-pgp-context.c:886
+#: camel/camel-pgp-context.c:891
 #, fuzzy
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr "İsmarıc göndrərilə bilmədi: alıcı bildirilməyib."
 
-#: camel/camel-pgp-context.c:892
+#: camel/camel-pgp-context.c:897
 #, fuzzy, c-format
 msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "GPG/PGP proqramına boru yaradıla bilmir. %s"
 
-#: camel/camel-pgp-context.c:903
+#: camel/camel-pgp-context.c:908
 #, fuzzy, c-format
 msgid "Cannot verify this message: couldn't create temp file: %s"
 msgstr "Müvəqqəti fayl yaradıla bilmir: %s"
 
-#: camel/camel-pgp-context.c:1069
+#: camel/camel-pgp-context.c:1076
 #, fuzzy
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr "İsmarıc göndrərilə bilmədi: alıcı bildirilməyib."
 
-#: camel/camel-pgp-context.c:1079
+#: camel/camel-pgp-context.c:1086
 #, fuzzy
 msgid "Cannot encrypt this message: no password provided"
 msgstr "İsmarıc göndrərilə bilmədi: göndərənin ünvanı hökmsüzdür."
 
-#: camel/camel-pgp-context.c:1086
+#: camel/camel-pgp-context.c:1093
 #, fuzzy, c-format
 msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "GPG/PGP proqramına boru yaradıla bilmir. %s"
 
-#: camel/camel-pgp-context.c:1095
+#: camel/camel-pgp-context.c:1102
 #, fuzzy
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr "İsmarıc göndrərilə bilmədi: alıcı bildirilməyib."
 
-#: camel/camel-pgp-context.c:1258
+#: camel/camel-pgp-context.c:1264
 #, fuzzy
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr "İsmarıc göndrərilə bilmədi: alıcı bildirilməyib."
 
-#: camel/camel-pgp-context.c:1266
+#: camel/camel-pgp-context.c:1272
 msgid "Cannot decrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1273
+#: camel/camel-pgp-context.c:1279
 #, fuzzy, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "GPG/PGP proqramına boru yaradıla bilmir. %s"
@@ -5922,13 +5988,13 @@ msgstr "%s a(ə) bağlana bilmirəm (qapı %d): %s"
 msgid "(unknown host)"
 msgstr "(namə'lum ev sahibi)"
 
-#: camel/camel-remote-store.c:361 camel/camel-remote-store.c:423
-#: camel/camel-remote-store.c:486
+#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
+#: camel/camel-remote-store.c:483
 #: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "Əməliyyat ləğv edildi"
 
-#: camel/camel-remote-store.c:489
+#: camel/camel-remote-store.c:486
 #, fuzzy, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Verici gözlanilməz şakildə bağlantını kəsdi"
@@ -6040,7 +6106,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:492
+#: camel/providers/imap/camel-imap-store.c:494
 msgid "Bad authentication response from server."
 msgstr "Vericidən xətalı tanıtma istəyi alındı."
 
@@ -6058,7 +6124,7 @@ msgstr "Namə'lum tanıtma vəziyyəti."
 
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:302
-#: camel/providers/pop3/camel-pop3-provider.c:68 mail/mail-config.glade.h:54
+#: camel/providers/pop3/camel-pop3-provider.c:68 mail/mail-config.glade.h:55
 msgid "Password"
 msgstr "Parol"
 
@@ -6088,37 +6154,37 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Qaydalı ifadə dərlanməsi bacarılmadı: %s: %s"
 
-#: camel/camel-service.c:154
+#: camel/camel-service.c:157
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "'%s' URLsi istifadəçi adına ehtiyac hiss edir"
 
-#: camel/camel-service.c:162
+#: camel/camel-service.c:165
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "'%s' URLsi ev sahibinə ehtiyac hiss edir"
 
-#: camel/camel-service.c:170
+#: camel/camel-service.c:173
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "'%s' URLsi yola ehtiyac hiss edir"
 
-#: camel/camel-service.c:548
+#: camel/camel-service.c:602
 #, c-format
 msgid "Resolving: %s"
 msgstr "\"%s\" Həll edilir"
 
-#: camel/camel-service.c:575
+#: camel/camel-service.c:629
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Ad axtarışında iflas etdim: %s"
 
-#: camel/camel-service.c:600
+#: camel/camel-service.c:654
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Qovşaq Ad axtarışı iflas etdi: %s: qovşaq tapılmadı"
 
-#: camel/camel-service.c:602
+#: camel/camel-service.c:656
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Qovşaq Ad axtarışı iflas etdi: %s: namə'lum səbəb"
@@ -6131,12 +6197,12 @@ msgstr "_Virtual Qovluq Sehirbazı ..."
 msgid "For reading mail as a query of another set of folders"
 msgstr "Başqa qovluq dəstələrinin istəyi olan məktubların oxunması üçün"
 
-#: camel/camel-session.c:322 camel/camel-session.c:391
+#: camel/camel-session.c:324 camel/camel-session.c:393
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "`%s' protokolu üçün xidmətçi yoxdur"
 
-#: camel/camel-session.c:508
+#: camel/camel-session.c:510
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -6188,7 +6254,7 @@ msgstr ""
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "%s üstündə qovluq qıfılı yaradıla bilmədi: %s"
 
-#: camel/camel-tcp-stream-openssl.c:463
+#: camel/camel-tcp-stream-openssl.c:491
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -6196,7 +6262,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:369
+#: camel/camel-tcp-stream-openssl.c:496 camel/camel-tcp-stream-ssl.c:369
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -6235,17 +6301,37 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "URL `%s' alına bilmir"
 
-#: camel/camel-vee-folder.c:546
+#: camel/camel-vee-folder.c:554
 #, c-format
 msgid "No such message %s in %s"
 msgstr "\"%s\"da(də) %s deye bir ismarıc yoxdur"
 
-#: camel/camel-vee-folder.c:641
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message: %s"
 msgstr "Bele bir ismarıc yoxdur: %s"
 
-#: camel/camel-vtrash-folder.c:106
+#: camel/camel-vee-store.c:250
+#, fuzzy, c-format
+msgid "Cannot delete folder: %s: Invalid operation"
+msgstr "%s üstündə qovluq qıfılı yaradıla bilmədi: %s"
+
+#: camel/camel-vee-store.c:286
+#, fuzzy, c-format
+msgid "Cannot delete folder: %s: No such folder"
+msgstr "Qovluq alına bilmədi: %s: %s"
+
+#: camel/camel-vee-store.c:298
+#, fuzzy, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "%s üstündə qovluq qıfılı yaradıla bilmədi: %s"
+
+#: camel/camel-vee-store.c:326
+#, fuzzy, c-format
+msgid "Cannot rename folder: %s: No such folder"
+msgstr "Qovluq alına bilmədi: %s: %s"
+
+#: camel/camel-vtrash-folder.c:109
 msgid "You cannot copy messages from this trash folder."
 msgstr "Buradakı ismarıcları zibilə göndərə bilməzsiniz."
 
@@ -6294,7 +6380,7 @@ msgid "Scanning for changed messages"
 msgstr "İsmarıclar qeyd edilir"
 
 #: camel/providers/imap/camel-imap-folder.c:1491
-#: camel/providers/imap/camel-imap-folder.c:1890
+#: camel/providers/imap/camel-imap-folder.c:1899
 msgid "This message is not currently available"
 msgstr "Bu ismarıc hazırda mövcuddur"
 
@@ -6308,7 +6394,7 @@ msgstr ""
 msgid "Scanning for new messages"
 msgstr "İsmarıclar qeyd edilir"
 
-#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/imap/camel-imap-folder.c:1936
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH cavabında ismarıc gövdəsi tapıla bilmədi"
 
@@ -6325,7 +6411,7 @@ msgstr "Ön yaddaş qovluğunu aça bilmədim: %s"
 msgid "Failed to cache message %s: %s"
 msgstr "Bacarılmayan İsmarıc %d"
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:14
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:15
 msgid "Checking for new mail"
 msgstr "Yeni ePoçt üçün baxılır"
 
@@ -6333,7 +6419,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:733
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:767
 msgid "Folders"
 msgstr "Qovluqlar"
 
@@ -6367,28 +6453,28 @@ 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:515
+#: camel/providers/imap/camel-imap-store.c:517
 #, 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:525
+#: camel/providers/imap/camel-imap-store.c:527
 #: camel/providers/smtp/camel-smtp-transport.c:388
 #, 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:549
+#: camel/providers/imap/camel-imap-store.c:551
 #, 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:564
+#: camel/providers/imap/camel-imap-store.c:566
 #: camel/providers/smtp/camel-smtp-transport.c:432
 msgid "You didn't enter a password."
 msgstr "Parolu girmədiniz."
 
-#: camel/providers/imap/camel-imap-store.c:590
+#: camel/providers/imap/camel-imap-store.c:592
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6399,12 +6485,12 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:889
+#: camel/providers/imap/camel-imap-store.c:891
 #, c-format
 msgid "No such folder %s"
 msgstr "%s deyə bir qovluq yoxdur"
 
-#: camel/providers/imap/camel-imap-store.c:1090
+#: camel/providers/imap/camel-imap-store.c:1131
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -6441,53 +6527,53 @@ msgstr "Qmail məktun qovluğu şəklindəki məktub faylı"
 msgid "For storing local mail in qmail maildir directories."
 msgstr "Yerli məktubları qmail məktub qovluqlarında saxlaya bilmək üçün"
 
-#: camel/providers/local/camel-local-provider.c:77
+#: camel/providers/local/camel-local-provider.c:78
 #, fuzzy
 msgid "Standard Unix mbox spools"
 msgstr "Standart UNIX poçt qutusu faylı"
 
-#: camel/providers/local/camel-local-provider.c:78
+#: camel/providers/local/camel-local-provider.c:79
 #, fuzzy
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr "Yerli məktubları qmail məktub qovluqlarında saxlaya bilmək üçün"
 
-#: camel/providers/local/camel-local-store.c:127
-#: camel/providers/local/camel-spool-store.c:112
+#: camel/providers/local/camel-local-store.c:132
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "%s kök saxlama dəqiq bir yol deyildir"
 
-#: camel/providers/local/camel-local-store.c:134
+#: camel/providers/local/camel-local-store.c:139
 #, c-format
 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:142
-#: camel/providers/local/camel-local-store.c:158
+#: camel/providers/local/camel-local-store.c:147
+#: camel/providers/local/camel-local-store.c:163
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Qovluq alına bilmədi: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:173
+#: camel/providers/local/camel-local-store.c:178
 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:183
+#: camel/providers/local/camel-local-store.c:190
 #, c-format
 msgid "Local mail file %s"
 msgstr "%s Yeli məktub faylı"
 
-#: camel/providers/local/camel-local-store.c:240
+#: camel/providers/local/camel-local-store.c:247
 #, 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:282
+#: camel/providers/local/camel-local-store.c:289
 #, 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:292
+#: camel/providers/local/camel-local-store.c:299
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "`%s' Qovluq indeks faylı silinə bilmir: %s"
@@ -6778,26 +6864,26 @@ msgstr "MH cərgə cığırı açıla bilmir: %s: %s"
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "İsmarıc mbox fayllına əlava edilə bimir: %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:133
+#: camel/providers/local/camel-spool-store.c:116
 #, fuzzy, c-format
 msgid "Spool `%s' does not exist or is not a regular file"
 msgstr "`%s' normal bir fayl deyildir ."
 
-#: camel/providers/local/camel-spool-store.c:159
+#: camel/providers/local/camel-spool-store.c:142
 #, fuzzy, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "`%s' faylı yoxdur ."
 
-#: camel/providers/local/camel-spool-store.c:181
+#: camel/providers/local/camel-spool-store.c:164
 #, fuzzy, c-format
 msgid "Spool mail file %s"
 msgstr "%s Yeli məktub faylı"
 
-#: camel/providers/local/camel-spool-store.c:227
+#: camel/providers/local/camel-spool-store.c:210
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:235
+#: camel/providers/local/camel-spool-store.c:218
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
@@ -6924,31 +7010,31 @@ msgstr "POP yığcamlaşdırılması alınır"
 msgid "Could not check POP server for new messages: %s"
 msgstr "POP vericisindəki yeni ismarıclar yoxlana bilmir: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:235
+#: camel/providers/pop3/camel-pop3-folder.c:242
 msgid "Could not open folder: message listing was incomplete."
 msgstr "Qovluq açıla bilmir: ismarıc siyahısı bütün deyil."
 
-#: camel/providers/pop3/camel-pop3-folder.c:259
+#: camel/providers/pop3/camel-pop3-folder.c:266
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "Seçili ismarıcları sil"
 
-#: camel/providers/pop3/camel-pop3-folder.c:335
+#: camel/providers/pop3/camel-pop3-folder.c:342
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "İsmarıc alına bilmir: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:351
+#: camel/providers/pop3/camel-pop3-folder.c:358
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "%s POP vericisindən ismarıclar alına bilmədi: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:374
+#: camel/providers/pop3/camel-pop3-folder.c:381
 #, c-format
 msgid "No message with uid %s"
 msgstr "%s uid'li ismarıc yoxdur"
 
-#: camel/providers/pop3/camel-pop3-folder.c:378
+#: camel/providers/pop3/camel-pop3-folder.c:385
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "%d POP ismarıcı alınır"
@@ -6966,7 +7052,7 @@ msgstr "İsmarıcları Vericidə burax"
 msgid "Delete after %s day(s)"
 msgstr "%s gün sonra sil"
 
-#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:53
+#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:54
 msgid "POP"
 msgstr "POP"
 
@@ -7062,7 +7148,7 @@ msgid "Unexpected response from POP server: %s"
 msgstr "IMAP vericisindən gözlənilməz cavab alındı: %s"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:73
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -7116,7 +7202,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Sendmail proqramı ilə məktub göndərilməsi"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:66
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -7758,13 +7844,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:309 e-util/e-time-utils.c:396
-#: widgets/misc/e-dateedit.c:1360 widgets/misc/e-dateedit.c:1587
+#: widgets/misc/e-dateedit.c:1385 widgets/misc/e-dateedit.c:1612
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:313 e-util/e-time-utils.c:388
-#: widgets/misc/e-dateedit.c:1357 widgets/misc/e-dateedit.c:1584
+#: widgets/misc/e-dateedit.c:1382 widgets/misc/e-dateedit.c:1609
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -7915,8 +8001,8 @@ msgstr ""
 "VAxsey, 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:232 filter/vfolder-rule.c:351
-#: mail/mail-account-gui.c:820
+#: filter/filter-folder.c:232 filter/vfolder-rule.c:356
+#: mail/mail-account-gui.c:822
 msgid "Select Folder"
 msgstr "Qovluq Seçin"
 
@@ -8167,7 +8253,7 @@ msgstr "Cavab verilən"
 msgid "Score"
 msgstr "Xal"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1242
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1251
 msgid "Sender"
 msgstr "Göndərən"
 
@@ -8200,7 +8286,7 @@ msgstr "başlayır"
 msgid "Stop Processing"
 msgstr "İşi Dayandır"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:893
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:917
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Mövzu"
@@ -8229,7 +8315,7 @@ msgstr "Qaydanı Düzəlt"
 msgid "Score Rules"
 msgstr "Qiymətləndirmə Qaydaları"
 
-#: filter/vfolder-rule.c:203
+#: filter/vfolder-rule.c:206
 msgid "Oops.  You need to to specify at least one folder as a source."
 msgstr ""
 
@@ -8250,7 +8336,7 @@ msgstr "Alınır"
 msgid "Please wait"
 msgstr "sonlanır"
 
-#: importers/elm-importer.c:171 importers/netscape-importer.c:701
+#: importers/elm-importer.c:171 importers/netscape-importer.c:708
 #: importers/pine-importer.c:369
 #, fuzzy, c-format
 msgid "Importing %s as %s"
@@ -8258,13 +8344,13 @@ msgstr ""
 "%s Alınır.\n"
 "%s Başladılır"
 
-#: importers/elm-importer.c:377 importers/netscape-importer.c:794
+#: importers/elm-importer.c:377 importers/netscape-importer.c:801
 #: importers/pine-importer.c:506
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "\"%s\" Göndərilir"
 
-#: importers/elm-importer.c:528 importers/netscape-importer.c:967
+#: importers/elm-importer.c:528 importers/netscape-importer.c:974
 #: importers/pine-importer.c:669 mail/component-factory.c:96
 #, fuzzy
 msgid "Mail"
@@ -8306,22 +8392,22 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: importers/netscape-importer.c:897 importers/pine-importer.c:602
+#: importers/netscape-importer.c:904 importers/pine-importer.c:602
 #, fuzzy
 msgid "Scanning directory"
 msgstr "IMAP qovluğu daranır"
 
-#: importers/netscape-importer.c:906
+#: importers/netscape-importer.c:913
 #, fuzzy
 msgid "Starting import"
 msgstr "_Başlama Tarixi"
 
-#: importers/netscape-importer.c:972
+#: importers/netscape-importer.c:979
 #, fuzzy
 msgid "Settings"
 msgstr "Qurğular..."
 
-#: importers/netscape-importer.c:993
+#: importers/netscape-importer.c:1000
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8412,21 +8498,27 @@ msgstr "_Seçənəklər..."
 msgid "Change this folder's properties"
 msgstr "Faylların seçənəklərini təkmilləşdir"
 
-#: mail/component-factory.c:790
+#: mail/component-factory.c:698
+msgid ""
+"Some of your mail settings seem corrupt, please check that everything is in "
+"order."
+msgstr ""
+
+#: mail/component-factory.c:812
 #, fuzzy
 msgid "New Mail Message"
 msgstr "_Məktub İsmarıcı"
 
-#: mail/component-factory.c:790
+#: mail/component-factory.c:812
 #, fuzzy
 msgid "New _Mail Message"
 msgstr "_Məktub İsmarıcı"
 
-#: mail/component-factory.c:821
+#: mail/component-factory.c:843
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolutionun ePoçt parçasını başlada bilmədim ."
 
-#: mail/component-factory.c:1007
+#: mail/component-factory.c:1032
 msgid "Cannot register storage with shell"
 msgstr "Nüsxəni qabıq ilə qeyd edə bilmədim"
 
@@ -8439,165 +8531,165 @@ msgstr "\"%s\"in Seçənəkləri"
 msgid "Properties"
 msgstr "Seçənəklər"
 
-#: mail/folder-browser.c:239 mail/mail-display.c:275
+#: mail/folder-browser.c:262 mail/mail-display.c:275
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Müvəqqəti qovluq yaradıla bilmədi: %s"
 
-#: mail/folder-browser.c:708
+#: mail/folder-browser.c:734
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/folder-browser.c:711 mail/folder-browser.c:716
-#: mail/folder-browser.c:720
+#: mail/folder-browser.c:737 mail/folder-browser.c:742
+#: mail/folder-browser.c:746
 msgid ", "
 msgstr ""
 
-#: mail/folder-browser.c:712
+#: mail/folder-browser.c:738
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/folder-browser.c:717
+#: mail/folder-browser.c:743
 #, fuzzy, c-format
 msgid "%d selected"
 msgstr "Silinən"
 
-#: mail/folder-browser.c:722
+#: mail/folder-browser.c:748
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr "%d saniyə"
 
-#: mail/folder-browser.c:724
+#: mail/folder-browser.c:750
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/folder-browser.c:958
+#: mail/folder-browser.c:993
 #, fuzzy
 msgid "Create vFolder from Search"
 msgstr "İsmarıcdan Qayda _Yarat"
 
-#: mail/folder-browser.c:1303
+#: mail/folder-browser.c:1338
 msgid "VFolder on _Subject"
 msgstr "_Mövzudakı vFolder"
 
-#: mail/folder-browser.c:1306
+#: mail/folder-browser.c:1341
 msgid "VFolder on Se_nder"
 msgstr "Gön_dərəndəki vFolder"
 
-#: mail/folder-browser.c:1309
+#: mail/folder-browser.c:1344
 msgid "VFolder on _Recipients"
 msgstr "_Alıcıdakı vFolder"
 
-#: mail/folder-browser.c:1312
+#: mail/folder-browser.c:1347
 msgid "VFolder on Mailing _List"
 msgstr "Məktublaşma Q_rupundakı VFolder"
 
-#: mail/folder-browser.c:1318
+#: mail/folder-browser.c:1353
 msgid "Filter on Sub_ject"
 msgstr "Mö_vzudakı Süzgəc"
 
-#: mail/folder-browser.c:1321
+#: mail/folder-browser.c:1356
 msgid "Filter on Sen_der"
 msgstr "Gön_dərəndəki  Süzgəc"
 
-#: mail/folder-browser.c:1324
+#: mail/folder-browser.c:1359
 msgid "Filter on Re_cipients"
 msgstr "_Alıcıdakı Süzgəc"
 
-#: mail/folder-browser.c:1327
+#: mail/folder-browser.c:1362
 msgid "Filter on _Mailing List"
 msgstr "_Məktublaşma Qrupundakı Süzgəc"
 
-#: mail/folder-browser.c:1338 ui/evolution-mail-message.xml.h:89
+#: mail/folder-browser.c:1373 ui/evolution-mail-message.xml.h:89
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "İsmarıcları _Fərqli Qeyd Et ..."
 
-#: mail/folder-browser.c:1340 ui/evolution-mail-message.xml.h:97
+#: mail/folder-browser.c:1375 ui/evolution-mail-message.xml.h:97
 msgid "_Save As..."
 msgstr "Fərqli _Qeyd Et ..."
 
-#: mail/folder-browser.c:1342
+#: mail/folder-browser.c:1377
 msgid "_Print"
 msgstr "_Çap Et"
 
-#: mail/folder-browser.c:1347 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1382 ui/evolution-mail-message.xml.h:96
 msgid "_Reply to Sender"
 msgstr "Göndərənə _Cavab Ver"
 
-#: mail/folder-browser.c:1349 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1384 ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Reply to _List"
 msgstr "_Hamısına Cavab Ver"
 
-#: mail/folder-browser.c:1351 ui/evolution-mail-message.xml.h:68
+#: mail/folder-browser.c:1386 ui/evolution-mail-message.xml.h:68
 msgid "Reply to _All"
 msgstr "_Hamısına Cavab Ver"
 
-#: mail/folder-browser.c:1353
+#: mail/folder-browser.c:1388
 msgid "_Forward"
 msgstr "_Çatdır"
 
-#: mail/folder-browser.c:1356 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1391 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "Oxun_muş olaraq İşarətlə"
 
-#: mail/folder-browser.c:1358 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1393 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Ox_unmamış olaraq İşarətlə"
 
-#: mail/folder-browser.c:1360
+#: mail/folder-browser.c:1395
 #, fuzzy
 msgid "Mark as _Important"
 msgstr "Vacib"
 
-#: mail/folder-browser.c:1362
+#: mail/folder-browser.c:1397
 #, fuzzy
 msgid "Mark as Unim_portant"
 msgstr "Ox_unmamış olaraq İşarətlə"
 
-#: mail/folder-browser.c:1367
+#: mail/folder-browser.c:1402
 msgid "_Move to Folder..."
 msgstr "Qovluğa _Daşı ..."
 
-#: mail/folder-browser.c:1369
+#: mail/folder-browser.c:1404
 msgid "_Copy to Folder..."
 msgstr "Qovluğa _Köçürt..."
 
-#: mail/folder-browser.c:1373 ui/evolution-mail-message.xml.h:99
+#: mail/folder-browser.c:1408 ui/evolution-mail-message.xml.h:99
 msgid "_Undelete"
 msgstr "_Geri Gətir"
 
-#: mail/folder-browser.c:1378
+#: mail/folder-browser.c:1413
 #, fuzzy
 msgid "Add Sender to Address Book"
 msgstr "Ünvan dəftəri əlavə et"
 
-#: mail/folder-browser.c:1383
+#: mail/folder-browser.c:1418
 msgid "Apply Filters"
 msgstr "Süzgəclər Əlavə Et"
 
-#: mail/folder-browser.c:1387
+#: mail/folder-browser.c:1422
 msgid "Create Ru_le From Message"
 msgstr "İsmarıcdan Qa_yda Yarat"
 
-#: mail/folder-browser.c:1538
+#: mail/folder-browser.c:1573
 msgid "Filter on Mailing List"
 msgstr "Məktublaşma Qrupundakı Süzgəc"
 
-#: mail/folder-browser.c:1539
+#: mail/folder-browser.c:1574
 msgid "VFolder on Mailing List"
 msgstr "Məktublaşma Qrupundakı VFolder"
 
-#: mail/folder-browser.c:1541
+#: mail/folder-browser.c:1576
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Məktublaşma Qrupunda Süz (%s)"
 
-#: mail/folder-browser.c:1542
+#: mail/folder-browser.c:1577
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "(%s) Məktublaşma Qrupundakı VFolder"
@@ -8673,19 +8765,19 @@ msgstr "Evolution Hesab Düzəldicisi"
 msgid "Evolution Account Editor"
 msgstr "Evolution Hesab Düzəldicisi"
 
-#: mail/mail-account-gui.c:945
+#: mail/mail-account-gui.c:947
 #, fuzzy
 msgid "Could not save signature file."
 msgstr ""
 "%s imza faylı açıla bilmədi:\n"
 "%s"
 
-#: mail/mail-account-gui.c:1022
+#: mail/mail-account-gui.c:1024
 #, fuzzy
 msgid "Save signature"
 msgstr "Imza faylı : "
 
-#: mail/mail-account-gui.c:1028
+#: mail/mail-account-gui.c:1030
 #, fuzzy
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
@@ -8696,7 +8788,7 @@ msgstr ""
 "\n"
 "Dəyişiklikləri qeyd etmak istəyirsiniz?"
 
-#: mail/mail-account-gui.c:1611
+#: mail/mail-account-gui.c:1615
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -8731,7 +8823,7 @@ 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?"
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:757 mail/mail-config.glade.h:42
+#: mail/mail-accounts.c:760 mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Mail Settings"
 msgstr "_Məktub Qurğuları..."
@@ -8834,39 +8926,39 @@ msgstr ""
 msgid "This message contains invalid recipients:"
 msgstr ""
 
-#: mail/mail-callbacks.c:453
+#: mail/mail-callbacks.c:454
 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:549
+#: mail/mail-callbacks.c:550
 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:779
+#: mail/mail-callbacks.c:783
 #, fuzzy
 msgid "an unknown sender"
 msgstr "Namə'lum xəta"
 
-#: mail/mail-callbacks.c:784
+#: mail/mail-callbacks.c:788
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1162
+#: mail/mail-callbacks.c:1171
 msgid "Move message(s) to"
 msgstr "İsmarıc(ları) buraya daşı "
 
-#: mail/mail-callbacks.c:1164
+#: mail/mail-callbacks.c:1173
 msgid "Copy message(s) to"
 msgstr "İsmarıc(ları) buraya köçürt"
 
-#: mail/mail-callbacks.c:1538
+#: mail/mail-callbacks.c:1547
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Bütün `%d' ismarıclarını düzəltmək istəyirsiniz?"
 
-#: mail/mail-callbacks.c:1560
+#: mail/mail-callbacks.c:1569
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -8874,7 +8966,7 @@ msgstr ""
 "Siz sadəcə olaraq Vəzifələr qovluğundakı\n"
 "ismarıcları düzəldə bilərsiniz."
 
-#: mail/mail-callbacks.c:1594
+#: mail/mail-callbacks.c:1603
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -8882,28 +8974,28 @@ msgstr ""
 "Sadəcə olaraq Göndərilən cərgəsinə qeyd edilən\n"
 "ismarıcları yeniden gönderebilirsiniz."
 
-#: mail/mail-callbacks.c:1606
+#: mail/mail-callbacks.c:1615
 #, fuzzy, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Bütün `%d' ismarıclarını düzəltmək istəyirsiniz?"
 
-#: mail/mail-callbacks.c:1627
+#: mail/mail-callbacks.c:1636
 msgid "No Message Selected"
 msgstr "Heç İsmarıc Seçilmədi"
 
-#: mail/mail-callbacks.c:1712
+#: mail/mail-callbacks.c:1721
 msgid "Save Message As..."
 msgstr "İsmarıcı Fərqli Qeyd Et..."
 
-#: mail/mail-callbacks.c:1714
+#: mail/mail-callbacks.c:1723
 msgid "Save Messages As..."
 msgstr "İsmarıcları Fərqli Qeyd Et..."
 
-#: mail/mail-callbacks.c:1859 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:1868 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Xəbərdarlıq"
 
-#: mail/mail-callbacks.c:1864
+#: mail/mail-callbacks.c:1873
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8911,12 +9003,12 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1871
+#: mail/mail-callbacks.c:1880
 #, fuzzy
 msgid "Do not ask me again."
 msgstr "Mənə bir də soruşma"
 
-#: mail/mail-callbacks.c:1976
+#: mail/mail-callbacks.c:1985
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -8925,20 +9017,20 @@ msgstr ""
 "Süzgəc mə'lumatını yükləmə xətası:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1986
+#: mail/mail-callbacks.c:1995
 #, fuzzy
 msgid "Filters"
 msgstr "_Süzgəclər ..."
 
-#: mail/mail-callbacks.c:2032
+#: mail/mail-callbacks.c:2041
 msgid "Print Message"
 msgstr "İsmarıcı Çap Et"
 
-#: mail/mail-callbacks.c:2078
+#: mail/mail-callbacks.c:2087
 msgid "Printing of message failed"
 msgstr "İsmarıların çap edilməsi bacarılmadı"
 
-#: mail/mail-callbacks.c:2162
+#: mail/mail-callbacks.c:2171
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Bütün %d ismarıclarını başqa pəncərədə açmaq istəyirsiniz?"
@@ -9001,88 +9093,109 @@ msgstr ""
 msgid "Evolution Account Assistant"
 msgstr "Evolution Hesab Sehirbazı"
 
-#: mail/mail-config.c:1486
-#, fuzzy
-msgid "Evolution Shortcuts"
-msgstr "\"Evolution\" çubuğu _qısa yolu"
+#: mail/mail-config.c:315
+#, fuzzy, c-format
+msgid "Account %d"
+msgstr "Hesab"
 
-#. right now, the URL always works basically as a matter of luck...
-#. * both IMAP and mbox spool stores have INBOX as their inbox folder
-#. * name. I don't think this will work with maildir. How can we figure out
-#. * what shortcut to insert?
-#.
 #: mail/mail-config.c:1618
+#, c-format
+msgid ""
+"Could not get inbox for new mail store:\n"
+"%s\n"
+"No shortcut will be created."
+msgstr ""
+
+#. Create the shortcut. FIXME: This only works if the
+#. * full name matches the path.
+#.
+#: mail/mail-config.c:1629
 #, fuzzy, c-format
 msgid "%s: Inbox"
 msgstr "mbox"
 
-#: mail/mail-config.c:1851
+#: mail/mail-config.c:1873
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:1922 mail/mail-config.c:1925
+#: mail/mail-config.c:1944 mail/mail-config.c:1947
 msgid "Connecting to server..."
 msgstr "Vericiyə bağlantı qurulur..."
 
 #: mail/mail-config.glade.h:1
+#, fuzzy
+msgid " _Check for supported types "
+msgstr " Dəstəklənən növləri yoxla "
+
+#: mail/mail-config.glade.h:2
 msgid " color"
 msgstr " rəng"
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:3
 #, fuzzy
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "Bu şifrləmə ilə imza dəstəklənmir"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr "Hesab"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr "Hesab Haqqında"
 
-#: mail/mail-config.glade.h:5 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:6 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Hesab İdarəsi"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "Accounts"
 msgstr "Hesablar"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:10
 msgid "Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:10 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Yapışdırılmış fayl"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:12
 msgid "Authentication"
 msgstr "Tanıtma"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:13
 msgid "Authentication Type: "
 msgstr "Kimlik Yoxlama Növü: "
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:14
 msgid "Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:16
 #, fuzzy
 msgid "Composer"
 msgstr "Yaz"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:17
+#, fuzzy
+msgid "Configuration"
+msgstr "ePoçt Quraşdırılması"
+
+#: mail/mail-config.glade.h:18
+#, fuzzy
+msgid "Confirm when Expunging a folder"
+msgstr "Qovluq açılır"
+
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -9098,254 +9211,241 @@ msgstr ""
 "\n"
 "Qurğularınızı qeyd etmək üçün \"Qurtar\"a basın."
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr "Ə_sas"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:26
 msgid "Default Forward style is: "
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:27
 msgid "Default character encoding: "
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:29
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:30
 msgid "Display"
 msgstr "Ekran"
 
-#: mail/mail-config.glade.h:27 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:31 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Qurtardı"
 
-#: mail/mail-config.glade.h:28 shell/e-local-storage.c:174
+#: mail/mail-config.glade.h:32 shell/e-local-storage.c:174
 msgid "Drafts"
 msgstr "Lahiyələr"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:33
 msgid "Drafts folder:"
 msgstr "Lahiyələr cərgəsi:"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:34
 #, fuzzy
 msgid "E_nable"
 msgstr "Fəallaşdır"
 
-#: mail/mail-config.glade.h:31
-#, fuzzy
-msgid "Each account must have a different name."
-msgstr "Hazırkı faylı fərqli bir ad altında qeyd et"
-
-#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:96
 #: widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr "Düzəlt..."
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:36
 #, fuzzy
 msgid "Enabled"
 msgstr "Fəallaşdır"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:37
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:38
 #, fuzzy
 msgid "HTML signature file:"
 msgstr "Imza faylı : "
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:39
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:40 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Kimlik"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:41
 msgid "In HTML mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Inline"
 msgstr "_Xətdə"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:43
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:44
 msgid "Mail Configuration"
 msgstr "ePoçt Quraşdırılması"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Mailbox location"
 msgstr "Məktub Qutusu Şəkli"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Make this my _default account"
 msgstr "Bunu əsas hesab olaraq göstər"
 
-#: mail/mail-config.glade.h:45
-msgid "Message _preview should be displayed by default"
-msgstr ""
-
-#: mail/mail-config.glade.h:46
-msgid "Message list should display in a _threaded fashion by default"
-msgstr ""
-
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "NNTP Server:"
 msgstr "LDAP Vericisi"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:49
 msgid "News"
 msgstr "Xəbərlər"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:51
 msgid "Optional Information"
 msgstr "Arzuya Bağlı Mə'lumatlar"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:53
 msgid "PGP Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 msgid "Pick a color"
 msgstr "Rəng al"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 #, fuzzy
 msgid "Prompt when sending messages with an _empty subject"
 msgstr "İsmarıc göndrərilə bilmədi: alıcı bildirilməyib."
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr "İsmarıc göndrərilə bilmədi: alıcı bildirilməyib."
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:60
 msgid "Qmail maildir "
 msgstr "Qmail cərgəsi "
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid "Quoted"
 msgstr "_Kotalanmış"
 
-#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "ePoçt Alınır"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:63
 msgid "Receiving Mail"
 msgstr "E-poçt Alınır"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:64
 msgid "Receiving Options"
 msgstr "Alma Seçənəkləri"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:65
 msgid "Required Information"
 msgstr "İstənən Mə'lumatlar"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:67
 msgid "Secure MIME"
 msgstr ""
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:68
 #, fuzzy
 msgid "Security"
 msgstr "_Təhlükəsizlik"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Select Filter Log file..."
 msgstr "Fayl seç"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:70
 msgid "Select PGP binary"
 msgstr "PGP binarını seç"
 
-#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:71 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "ePoçt Göndərilir"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:72
 msgid "Sending Mail"
 msgstr "E-poçt Göndərilir"
 
-#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:74 mail/message-list.etspec.h:6
 #: shell/e-local-storage.c:177
 msgid "Sent"
 msgstr "Göndərildi"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:75
 msgid "Sent and Draft Messages"
 msgstr "Göndərilən və Lahiyə İsmarıcları"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:76
 msgid "Sent messages folder:"
 msgstr "Göndərilən ismarıclar cərgəsi:"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:77
 msgid "Server Configuration"
 msgstr "Verici Quraşdırılması"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 msgid "Server Type: "
 msgstr "Verici Növü: "
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "Server requires _authentication"
 msgstr "Verici tanıtmaya ehtiyac hiss edər"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:80
 msgid "Signature file:"
 msgstr "Imza faylı : "
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Source"
 msgstr "Qaynaqlar"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "Source Information"
 msgstr "Mə'lumat Yoxdur"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:83
 msgid "Sources"
 msgstr "Qaynaqlar"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
 msgid "Special Folders"
 msgstr "Xüsusi Cərgələr"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:85
 msgid "Standard Unix mbox"
 msgstr "Standart UNIX poçt qutusu faylı"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "Use secure connection (_SSL)"
 msgstr "E'tibarlı bağlantı (SSL) işlət"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -9356,90 +9456,86 @@ msgstr ""
 "\n"
 "Başlamaq üçün \"Sonrakı\" düyməsinə basın. "
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:92
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:93
 #, fuzzy
 msgid "_Automatically check for new mail every"
 msgstr "ePoçtları avtomatik yoxla:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "_Check for supported types"
 msgstr " Dəstəklənən növləri yoxla "
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "_Email Address:"
 msgstr "ePoçt Ünvanı: "
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:98
 msgid "_Empty trash folders on exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 #, fuzzy
 msgid "_Full Name:"
 msgstr "Tam Ad:"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "_HTML Signature:"
 msgstr "Imza faylı : "
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "_Highlight citations with"
 msgstr "Sitatları Rəngləndir: "
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "_Host:"
 msgstr "Ev Sahibi:"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 msgid "_Log filter actions to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 #, fuzzy
 msgid "_Mark messages as Read after"
 msgstr "İsmarıcları bundan sonra \"Oxundu\" olaraq işarətlə: "
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 #, fuzzy
 msgid "_Name:"
 msgstr "Ad :"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 #, fuzzy
 msgid "_Organization:"
 msgstr "Orqanizasiya"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:109
 #, fuzzy
 msgid "_PGP binary path:"
 msgstr "PGP binarı cığırı:"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "_Path:"
 msgstr "Yol:"
 
-#: mail/mail-config.glade.h:110
-msgid "_Remember PGP Passphrase until exit"
-msgstr ""
-
 #: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "_Remember this password"
@@ -9477,46 +9573,46 @@ msgstr ""
 msgid "seconds."
 msgstr "saniyə."
 
-#: mail/mail-crypto.c:60
+#: mail/mail-crypto.c:59
 #, fuzzy
 msgid "Could not create a PGP signature context."
 msgstr "%s üstündəki POP vericisi ilə ünsiyyət qurula bilmir."
 
-#: mail/mail-crypto.c:86
+#: mail/mail-crypto.c:84
 #, fuzzy
 msgid "Could not create a PGP verification context."
 msgstr "%s üstündəki POP vericisi ilə ünsiyyət qurula bilmir."
 
-#: mail/mail-crypto.c:116
+#: mail/mail-crypto.c:113
 #, fuzzy
 msgid "Could not create a PGP encryption context."
 msgstr "Dialoq qutusunu yarada bilmədim ."
 
-#: mail/mail-crypto.c:142
+#: mail/mail-crypto.c:138
 #, fuzzy
 msgid "Could not create a PGP decryption context."
 msgstr ""
 "%s qovluğunu yarada bilmədim:\n"
 "%s"
 
-#: mail/mail-crypto.c:177
+#: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
 msgstr ""
 
-#: mail/mail-crypto.c:209
+#: mail/mail-crypto.c:205
 msgid "Could not create a S/MIME certsonly context."
 msgstr ""
 
-#: mail/mail-crypto.c:240
+#: mail/mail-crypto.c:236
 msgid "Could not create a S/MIME encryption context."
 msgstr ""
 
-#: mail/mail-crypto.c:271
+#: mail/mail-crypto.c:267
 #, fuzzy
 msgid "Could not create a S/MIME envelope context."
 msgstr "Dialoq qutusunu yarada bilmədim ."
 
-#: mail/mail-crypto.c:301
+#: mail/mail-crypto.c:297
 #, fuzzy
 msgid "Could not create a S/MIME decode context."
 msgstr "Dialoq qutusunu yarada bilmədim ."
@@ -9565,12 +9661,12 @@ msgstr "Körpünü səyyahda aç"
 msgid "Copy Link Location"
 msgstr "Ünvanı köçür"
 
-#: mail/mail-display.c:1519
+#: mail/mail-display.c:1520
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "Fərqli qeyd et"
 
-#: mail/mail-display.c:1521
+#: mail/mail-display.c:1523
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Fərqli qeyd et ..."
@@ -9588,89 +9684,89 @@ msgstr "MIME ismarıcı açıla bilmədi: Mənbə kodu gösteriliyor."
 msgid "Date"
 msgstr "Tarix"
 
-#: mail/mail-format.c:860
+#: mail/mail-format.c:862
 #, fuzzy
 msgid "Bad Address"
 msgstr "ePoçt Ünvanı: "
 
-#: mail/mail-format.c:882 mail/message-list.etspec.h:3
+#: mail/mail-format.c:903 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "Göndərən"
 
-#: mail/mail-format.c:885
+#: mail/mail-format.c:906
 #, fuzzy
 msgid "Reply-To"
 msgstr "Cavab ver"
 
-#: mail/mail-format.c:888 mail/message-list.etspec.h:10
+#: mail/mail-format.c:910 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Gn:"
 
-#: mail/mail-format.c:891
+#: mail/mail-format.c:914
 #, fuzzy
 msgid "Cc"
 msgstr "Cc:"
 
-#: mail/mail-format.c:1311
+#: mail/mail-format.c:1357
 msgid "No GPG/PGP program configured."
 msgstr "Heç GPG/PGP proqramı qurulmayıb."
 
-#: mail/mail-format.c:1327
+#: mail/mail-format.c:1373
 msgid "Encrypted message not displayed"
 msgstr "Kodlanmış ismarıc göstərilmədi"
 
-#: mail/mail-format.c:1338
+#: mail/mail-format.c:1384
 msgid "Encrypted message"
 msgstr "Kodlanmış İsmarıc"
 
-#: mail/mail-format.c:1339
+#: mail/mail-format.c:1385
 msgid "Click icon to decrypt."
 msgstr "Kodu açmaq üçün timsala basın."
 
-#: mail/mail-format.c:1394
+#: mail/mail-format.c:1440
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Bu ismarıc digital olaraq imzalanmışdır və original olduğu düşünülür."
 
-#: mail/mail-format.c:1405
+#: mail/mail-format.c:1451
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "Bu ismarıc digital olaraq imzalanmışdır amma original olduğu düşünülmür."
 
-#: mail/mail-format.c:2083
+#: mail/mail-format.c:2128
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP saytını göstərən ox (%s)"
 
-#: mail/mail-format.c:2097
+#: mail/mail-format.c:2142
 #, 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:2102
+#: mail/mail-format.c:2147
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Yerli faylyi göstərən ox (%s)"
 
-#: mail/mail-format.c:2131
+#: mail/mail-format.c:2176
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "FTP saytını göstərən ox (%s)"
 
-#: mail/mail-format.c:2139
+#: mail/mail-format.c:2184
 #, 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:2144
+#: mail/mail-format.c:2189
 msgid "Malformed external-body part."
 msgstr "Xəsərli xarici proqram parçası."
 
-#: mail/mail-local.c:547
+#: mail/mail-local.c:563
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "Qovluq yenidən qurulur"
 
-#: mail/mail-local.c:620
+#: mail/mail-local.c:636
 #, fuzzy, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -9679,29 +9775,29 @@ msgstr ""
 "Qovluğun meta mə'lumatını qeyd eda bilmədim; Bu qovluğu bir də aça\n"
 "bilməyə biləsən: %s"
 
-#: mail/mail-local.c:676
+#: mail/mail-local.c:689
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "%s üstündə qovluq qıfılı yaradıla bilmədi: %s"
 
-#: mail/mail-local.c:722
+#: mail/mail-local.c:735
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 "`%s' qovluğu silinə bilmir:\n"
 "%s"
 
-#: mail/mail-local.c:1052
+#: mail/mail-local.c:1075
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "\"%s\" qovluğu \"%s\" şəklinə çevrilir"
 
-#: mail/mail-local.c:1067
+#: mail/mail-local.c:1090
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1089
+#: mail/mail-local.c:1112
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -9709,17 +9805,17 @@ msgstr ""
 "Bu qovluğu bir də aça bilməsən, onu əllə\n"
 "bərpa etməlisən."
 
-#: mail/mail-local.c:1180
+#: mail/mail-local.c:1200
 #, fuzzy
 msgid "You cannot change the format of a non-local folder."
 msgstr "Buradakı ismarıcları zibilə göndərə bilməzsiniz."
 
-#: mail/mail-local.c:1190
+#: mail/mail-local.c:1209
 #, fuzzy, c-format
-msgid "Reconfigure %s"
+msgid "Reconfigure /%s"
 msgstr "%s i(ı) Quraşdır"
 
-#: mail/mail-mt.c:188
+#: mail/mail-mt.c:199
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -9728,7 +9824,7 @@ msgstr ""
 "'%s' sırasında xəta:\n"
 "%s"
 
-#: mail/mail-mt.c:191
+#: mail/mail-mt.c:202
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -9738,21 +9834,25 @@ msgstr ""
 "%s"
 
 #. Remember the password?
-#: mail/mail-mt.c:454
+#: mail/mail-mt.c:509
 msgid "Remember this password"
 msgstr "Bu parolu yadda saxla"
 
-#: mail/mail-mt.c:511
+#: mail/mail-mt.c:510
+msgid "Remember this password for the remainder of this session"
+msgstr ""
+
+#: mail/mail-mt.c:567
 #, fuzzy, c-format
 msgid "Enter Password for %s"
 msgstr "%s üçün parol girin"
 
-#: mail/mail-mt.c:514
+#: mail/mail-mt.c:570
 #, fuzzy
 msgid "Enter Password"
 msgstr "%s üçün parol girin"
 
-#: mail/mail-mt.c:824
+#: mail/mail-mt.c:886
 msgid "Working"
 msgstr "İşləyir"
 
@@ -9910,6 +10010,11 @@ msgstr "Data yazıla bilmədi: %s"
 msgid "Disconnecting from %s"
 msgstr ""
 
+#: mail/mail-ops.c:2065
+#, fuzzy, c-format
+msgid "Reconnecting to %s"
+msgstr "Vericiyə bağlantı qurulur..."
+
 #: mail/mail-search-dialogue.c:113
 msgid "_Search"
 msgstr "A_xtar"
@@ -9973,12 +10078,12 @@ msgstr ""
 msgid "Type: %s"
 msgstr "Növ:"
 
-#: mail/mail-send-recv.c:282
+#: mail/mail-send-recv.c:283
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "ePoçt Göndər və Al"
 
-#: mail/mail-send-recv.c:283
+#: mail/mail-send-recv.c:284
 #, fuzzy
 msgid "Cancel All"
 msgstr "Ləğv Edildi"
@@ -10001,36 +10106,50 @@ msgstr "Ləğv Edildi."
 msgid "User canceled operation."
 msgstr "İstifadəçi əməliyyatı ləğv etdi."
 
-#: mail/mail-tools.c:173
+#: mail/mail-tools.c:133
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Müvəqqəti '%s' mboxu yaradıla bilmir: %s"
 
-#: mail/mail-tools.c:299
+#: mail/mail-tools.c:259
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Çatdırılmış ismarıc - %s"
 
-#: mail/mail-tools.c:303
+#: mail/mail-tools.c:263
 #, fuzzy
 msgid "Forwarded message"
 msgstr "Çatdırılmış ismarıc"
 
-#: mail/mail-tools.c:439
+#: mail/mail-tools.c:396
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "Çatdırılmış ismarıc"
 
-#: mail/mail-vfolder.c:161
+#: mail/mail-vfolder.c:84
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "%s qovluğu açılır"
 
-#: mail/mail-vfolder.c:435
+#: mail/mail-vfolder.c:201
+#, fuzzy, c-format
+msgid "Updating vfolders for uri: %s"
+msgstr "\"%s\" dakı qovluqlar daranır"
+
+#: mail/mail-vfolder.c:414
+#, c-format
+msgid ""
+"The following vFolder(s):\n"
+"%sUsed the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+
+#: mail/mail-vfolder.c:636
 msgid "VFolders"
 msgstr "VFolderlər"
 
-#: mail/mail-vfolder.c:541
+#: mail/mail-vfolder.c:742
 msgid "New VFolder"
 msgstr "Yeni VFolder"
 
@@ -10100,7 +10219,7 @@ msgstr "%a %l %M %p"
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2331
+#: mail/message-list.c:2334
 #, fuzzy
 msgid "Generating message list"
 msgstr "İsmarıclar qeyd edilir"
@@ -10193,34 +10312,34 @@ msgstr "Qeydiyyatdan Çıx"
 msgid "Evolution component for the executive summary."
 msgstr "İcracı mündəricat üçün 'Evolution' parçası."
 
-#: my-evolution/component-factory.c:30
+#: my-evolution/component-factory.c:45
 msgid "Folder containing the Evolution Summary"
 msgstr ""
 
-#: my-evolution/component-factory.c:139
+#: my-evolution/component-factory.c:154
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr "Evolutionun İcracı Mündəricat parçasını başlada bilmədim ."
 
-#: my-evolution/e-summary-calendar.c:248 my-evolution/e-summary-calendar.c:266
+#: my-evolution/e-summary-calendar.c:263 my-evolution/e-summary-calendar.c:281
 msgid "Appointments"
 msgstr "Görüşlər"
 
-#: my-evolution/e-summary-calendar.c:249
+#: my-evolution/e-summary-calendar.c:264
 #, fuzzy
 msgid "No appointments"
 msgstr "Görüşləri göstər"
 
-#: my-evolution/e-summary-calendar.c:286
+#: my-evolution/e-summary-calendar.c:301
 #, fuzzy
 msgid "%k%M %d %B"
 msgstr "%A %d %B"
 
-#: my-evolution/e-summary-calendar.c:288
+#: my-evolution/e-summary-calendar.c:303
 #, fuzzy
 msgid "%l:%M %d %B"
 msgstr "%A %d %B"
 
-#: my-evolution/e-summary-mail.c:115
+#: my-evolution/e-summary-mail.c:130
 #, fuzzy
 msgid "Mail summary"
 msgstr "Poçt Mündəricatı"
@@ -10229,91 +10348,91 @@ msgstr "Poçt Mündəricatı"
 #. see in My Evolution by default. You can find the list of all
 #. stations and their codes in Evolution sources
 #. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-preferences.c:65
-#: my-evolution/e-summary-weather.c:615
+#: my-evolution/e-summary-preferences.c:80
+#: my-evolution/e-summary-weather.c:630
 msgid "KBOS:ZSAM:EGAA"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:427
+#: my-evolution/e-summary-preferences.c:441
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:449
+#: my-evolution/e-summary-preferences.c:463
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:890
+#: my-evolution/e-summary-preferences.c:929
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:898
+#: my-evolution/e-summary-preferences.c:937
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:902
+#: my-evolution/e-summary-preferences.c:941
 msgid "Name:"
 msgstr "Ad :"
 
-#: my-evolution/e-summary-preferences.c:1438
+#: my-evolution/e-summary-preferences.c:1486
 #, fuzzy
 msgid "Summary Settings"
 msgstr "Xülasə daxil edən"
 
-#: my-evolution/e-summary-rdf.c:277 my-evolution/e-summary-rdf.c:362
-#: my-evolution/e-summary-rdf.c:395
+#: my-evolution/e-summary-rdf.c:297 my-evolution/e-summary-rdf.c:382
+#: my-evolution/e-summary-rdf.c:415
 #, fuzzy
 msgid "Error downloading RDF"
 msgstr "<b>Təqvim yükləmə xətası</b>"
 
-#: my-evolution/e-summary-rdf.c:487
+#: my-evolution/e-summary-rdf.c:507
 #, fuzzy
 msgid "News Feed"
 msgstr "_Yeni Qovluq"
 
-#: my-evolution/e-summary-tasks.c:216
+#: my-evolution/e-summary-tasks.c:238
 #, fuzzy
 msgid "No tasks"
 msgstr "Vəzifələri göstər"
 
-#: my-evolution/e-summary-tasks.c:255
+#: my-evolution/e-summary-tasks.c:277
 #, fuzzy
 msgid "(No Description)"
 msgstr "İzah :"
 
-#: my-evolution/e-summary-weather.c:57
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:334
+#: my-evolution/e-summary-weather.c:349
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:524
+#: my-evolution/e-summary-weather.c:539
 #, fuzzy
 msgid "Weather"
 msgstr "Başqa"
 
-#: my-evolution/e-summary-weather.c:676
+#: my-evolution/e-summary-weather.c:691
 #, fuzzy
 msgid "Regions"
 msgstr "Bölmələr :"
 
-#: my-evolution/e-summary.c:162
+#: my-evolution/e-summary.c:187
 #, fuzzy
 msgid "%A, %B %e %Y"
 msgstr "%a %B %d %Y"
 
-#: my-evolution/e-summary.c:512 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:568 ui/my-evolution.xml.h:3
 #, fuzzy
 msgid "Print Summary"
 msgstr "Mündəricat"
 
-#: my-evolution/e-summary.c:558
+#: my-evolution/e-summary.c:614
 #, fuzzy
 msgid "Printing of Summary failed"
 msgstr "İsmarıların çap edilməsi bacarılmadı"
 
-#: my-evolution/main.c:52
+#: my-evolution/main.c:67
 #, fuzzy
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "init_bonobo(): Bonobonu başlada bilmədim"
@@ -11787,43 +11906,43 @@ msgstr ""
 "\"Evolution\" qovluğunda yerləşmir. \"Evolution\" \n"
 "istifadəçi fayllarınin qurulması üçün onu sil."
 
-#: shell/e-shell-folder-commands.c:174
+#: shell/e-shell-folder-commands.c:176
 #, fuzzy
 msgid "Cannot move a folder over itself."
 msgstr "Qovluq alına bilmədi: %s: %s"
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:178
 #, fuzzy
 msgid "Cannot copy a folder over itself."
 msgstr ""
 "Faylları `%s''yə\n"
 "köçürdə bilmədim ."
 
-#: shell/e-shell-folder-commands.c:190
+#: shell/e-shell-folder-commands.c:192
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:294
+#: shell/e-shell-folder-commands.c:312
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:299
+#: shell/e-shell-folder-commands.c:317
 #, fuzzy
 msgid "Copy folder"
 msgstr "Qovluğa Köçürt"
 
-#: shell/e-shell-folder-commands.c:337
+#: shell/e-shell-folder-commands.c:359
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:342
+#: shell/e-shell-folder-commands.c:364
 #, fuzzy
 msgid "Move folder"
 msgstr "Qovluğa Köçür"
 
-#: shell/e-shell-folder-commands.c:367
+#: shell/e-shell-folder-commands.c:390
 #, fuzzy, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -11832,34 +11951,35 @@ msgstr ""
 "`%s' qovluğu silinə bilmir:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:383
+#: shell/e-shell-folder-commands.c:406
 #, fuzzy, c-format
-msgid "Delete folder '%s'"
-msgstr "%s gün sonra sil"
+msgid "Delete \"%s\""
+msgstr "Sil"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:393
+#: shell/e-shell-folder-commands.c:416
 #, fuzzy, c-format
-msgid "Are you sure you want to remove the '%s' folder?"
+msgid "Are you sure you want to remove the \"%s\" folder?"
 msgstr "Bu `%s' vəzifəsini həqiqətən də silmək istəyirsiniz?"
 
-#. Popup a dialog asking what the user would like to rename
-#. the folder to
-#: shell/e-shell-folder-commands.c:468
+#: shell/e-shell-folder-commands.c:470
 #, fuzzy, c-format
-msgid "Rename folder '%s'"
+msgid ""
+"Cannot rename folder:\n"
+"%s"
+msgstr ""
+"`%s' qovluğu silinə bilmir:\n"
+"%s"
+
+#: shell/e-shell-folder-commands.c:503
+#, fuzzy, c-format
+msgid "Rename the \"%s\" folder to:"
 msgstr "%s qovluğu açılır"
 
-#: shell/e-shell-folder-commands.c:472
+#: shell/e-shell-folder-commands.c:506
 #, fuzzy
-msgid "Rename"
-msgstr "Qayda adı :"
-
-#. Make, pack the label
-#: shell/e-shell-folder-commands.c:480
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "Qovluq adı:"
+msgid "Rename folder"
+msgstr "%s qovluğu açılır"
 
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
@@ -11897,7 +12017,7 @@ msgstr "Bildirilən qovluq adı hökmlü deyildir ."
 msgid "Evolution - Create new folder"
 msgstr "\"Evolution\" - Yeni qovluq yarat"
 
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:99
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -11905,7 +12025,7 @@ msgstr ""
 "Bildirilən gediş üçün bu seçili qovluq növü \n"
 "hökmlü deyildir ."
 
-#: shell/e-shell-folder-selection-dialog.c:348
+#: shell/e-shell-folder-selection-dialog.c:360
 msgid "New..."
 msgstr "Yeni ..."
 
@@ -11913,7 +12033,11 @@ msgstr "Yeni ..."
 msgid "(Untitled)"
 msgstr "( Adsız )"
 
-#: shell/e-shell-importer.c:102
+#: shell/e-shell-importer.c:141
+msgid "Choose the type of importer to run"
+msgstr ""
+
+#: shell/e-shell-importer.c:144
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -11927,9 +12051,13 @@ 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:150
+msgid "Please select the information that you would like to import"
+msgstr ""
+
 #. Importer isn't ready yet.
 #. Wait 5 seconds and try again.
-#: shell/e-shell-importer.c:197
+#: shell/e-shell-importer.c:242
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11940,7 +12068,7 @@ msgstr ""
 "Alıcı hazır deyil.\n"
 "Yenidən sınamaq üçün 5 saniyə gözlənir."
 
-#: shell/e-shell-importer.c:217 shell/e-shell-importer.c:248
+#: shell/e-shell-importer.c:262 shell/e-shell-importer.c:293
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11949,16 +12077,16 @@ msgstr ""
 "%s Alınır\n"
 "%d üzvü alınır."
 
-#: shell/e-shell-importer.c:351
+#: shell/e-shell-importer.c:396
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "`%s' faylı yoxdur ."
 
-#: shell/e-shell-importer.c:363
+#: shell/e-shell-importer.c:408
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:378
+#: shell/e-shell-importer.c:423
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -11967,11 +12095,11 @@ msgstr ""
 "İş görəcək alıcı mövcud deyildir\n"
 "%s"
 
-#: shell/e-shell-importer.c:388
+#: shell/e-shell-importer.c:433
 msgid "Importing"
 msgstr "Alınır"
 
-#: shell/e-shell-importer.c:396
+#: shell/e-shell-importer.c:441
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -11980,17 +12108,17 @@ msgstr ""
 "%s Alınır.\n"
 "%s Başladılır"
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:454
 #, c-format
 msgid "Error starting %s"
 msgstr "%s başladırkən xəta oldu"
 
-#: shell/e-shell-importer.c:428
+#: shell/e-shell-importer.c:473
 #, c-format
 msgid "Error loading %s"
 msgstr "%s yüklənərkən xəta oldu"
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:490
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11999,32 +12127,56 @@ msgstr ""
 "%s Alınır\n"
 "Alınan üzv 1."
 
-#: shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:560
 msgid "Automatic"
 msgstr "Avtomatik"
 
-#: shell/e-shell-importer.c:566
+#: shell/e-shell-importer.c:611
 msgid "Filename:"
 msgstr "Fayl adı:"
 
-#: shell/e-shell-importer.c:571
+#: shell/e-shell-importer.c:616
 msgid "Select a file"
 msgstr "Fayl seç"
 
-#: shell/e-shell-importer.c:581
+#: shell/e-shell-importer.c:626
 msgid "File type:"
 msgstr "Fayl növü:"
 
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:651
+msgid "Import data and settings from older programs"
+msgstr ""
+
+#: shell/e-shell-importer.c:655
+#, fuzzy
+msgid "Import a single file"
+msgstr "Xarici fayl şəklini idxal et"
+
+#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:582
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:585
+msgid "Starting Intelligent Importers"
+msgstr ""
+
+#: shell/e-shell-importer.c:840 shell/e-shell-startup-wizard.c:703
+#, fuzzy, c-format
+msgid "From %s:"
+msgstr "Göndərən:"
+
+#: shell/e-shell-importer.c:1003
 #, fuzzy
 msgid "Select folder"
 msgstr "Qovluq Seçin"
 
-#: shell/e-shell-importer.c:646
+#: shell/e-shell-importer.c:1004
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:689 shell/importer/intelligent.c:194
+#: shell/e-shell-importer.c:1116 shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "Al"
 
@@ -12044,45 +12196,30 @@ msgstr ""
 msgid "Cannot initialize the Evolution Mailer Wizard interface"
 msgstr "Evolutionun ePoçt parçasını başlada bilmədim ."
 
-#: shell/e-shell-startup-wizard.c:582
-msgid ""
-"Please wait...\n"
-"Scanning for existing setups"
-msgstr ""
-
-#: shell/e-shell-startup-wizard.c:585
-msgid "Starting Intelligent Importers"
-msgstr ""
-
-#: shell/e-shell-startup-wizard.c:703
-#, fuzzy, c-format
-msgid "From %s:"
-msgstr "Göndərən:"
-
 #: shell/e-shell-startup-wizard.c:745
 msgid ""
 "Please select the information\n"
 "that you would like to import"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:183
+#: shell/e-shell-view-menu.c:201
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug-buddy $PATH yolunda tapıla bilmədi."
 
-#: shell/e-shell-view-menu.c:191
+#: shell/e-shell-view-menu.c:209
 msgid "Bug buddy could not be run."
 msgstr "\"Bug-buddy\" işə salına bilmədi."
 
-#: shell/e-shell-view-menu.c:217
+#: shell/e-shell-view-menu.c:235
 #, fuzzy
 msgid "Ximian Evolution"
 msgstr "Evolution"
 
-#: shell/e-shell-view-menu.c:219
+#: shell/e-shell-view-menu.c:237
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Təlif haqqı 1999, 2000, 2001 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:221
+#: shell/e-shell-view-menu.c:239
 #, fuzzy
 msgid ""
 "Ximian Evolution is a suite of groupware applications\n"
@@ -12092,29 +12229,38 @@ msgstr ""
 "\"Evolution\" GNOME masa üstü üçün gözəl bir ePoçt, \n"
 "təqvim və əlaqələr idarə proqramıdır."
 
-#: shell/e-shell-view-menu.c:424
+#: shell/e-shell-view-menu.c:442
 msgid "Go to folder..."
 msgstr "Qovluğa get ..."
 
-#: shell/e-shell-view-menu.c:425
+#: shell/e-shell-view-menu.c:443
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:570
+#: shell/e-shell-view-menu.c:563
 #, fuzzy
 msgid "Create a new shortcut"
 msgstr "Yeni bir qısa yol qrupu yarat"
 
-#: shell/e-shell-view-menu.c:571
+#: shell/e-shell-view-menu.c:564
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:685
+#: shell/e-shell-view-menu.c:595
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:603
+#, fuzzy, c-format
+msgid "Error executing %s."
+msgstr "İşə salıcı süzgəc xətası: %s: %s"
+
+#: shell/e-shell-view-menu.c:705
 #, fuzzy
 msgid "Work Online"
 msgstr "Xətdə İşlə"
 
-#: shell/e-shell-view-menu.c:698 shell/e-shell-view-menu.c:711
+#: shell/e-shell-view-menu.c:718 shell/e-shell-view-menu.c:731
 #: ui/evolution.xml.h:30
 msgid "Work Offline"
 msgstr "Xətdən Qopuq İşlə"
@@ -12123,46 +12269,46 @@ msgstr "Xətdən Qopuq İşlə"
 msgid "(No folder displayed)"
 msgstr "( Heç bir qovluq göstərilmir )"
 
-#: shell/e-shell-view.c:1478
+#: shell/e-shell-view.c:1512
 #, c-format
 msgid "%s (%d)"
 msgstr ""
 
-#: shell/e-shell-view.c:1480
+#: shell/e-shell-view.c:1514
 #, fuzzy
 msgid "(None)"
 msgstr "( Adsızdır )"
 
-#: shell/e-shell-view.c:1485
+#: shell/e-shell-view.c:1519
 #, fuzzy, c-format
 msgid "%s - Ximian Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1487
+#: shell/e-shell-view.c:1521
 #, fuzzy, c-format
 msgid "%s - Ximian Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell-view.c:1527
+#: shell/e-shell-view.c:1561
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1534
+#: shell/e-shell-view.c:1568
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1540
+#: shell/e-shell-view.c:1574
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:560
+#: shell/e-shell.c:562
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Yerli qeydi quraşdıra bilmədim -- %s"
 
-#: shell/e-shell.c:1496
+#: shell/e-shell.c:1488
 #, fuzzy, c-format
 msgid ""
 "Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
@@ -12171,25 +12317,25 @@ msgstr ""
 "Vaxsey! `%s' nümayişi gözlənilməz şəkildə sonlandı. :-(\n"
 "Bu, %s qisminin çökdüyünə işarət edir."
 
-#: shell/e-shell.c:1700 widgets/misc/e-cell-date-edit.c:248
+#: shell/e-shell.c:1692 widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "Oldu"
 
-#: shell/e-shell.c:1702
+#: shell/e-shell.c:1694
 #, fuzzy
 msgid "Invalid arguments"
 msgstr "Hökmsüz ismarıc mövtəviyyatı"
 
-#: shell/e-shell.c:1704
+#: shell/e-shell.c:1696
 #, fuzzy
 msgid "Cannot register on OAF"
 msgstr "Nüsxəni qabıq ilə qeyd edə bilmədim"
 
-#: shell/e-shell.c:1706
+#: shell/e-shell.c:1698
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:1708 shell/e-storage.c:491
+#: shell/e-shell.c:1700 shell/e-storage.c:496
 msgid "Generic error"
 msgstr "Ümumi xəta"
 
@@ -12327,52 +12473,61 @@ msgstr "Qısa yolları qeyd edərkən xəta oldu."
 msgid "Shortcuts"
 msgstr "_Qısa Yol Çubuğu"
 
+#: shell/e-storage-set-view.c:645
+#, fuzzy, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr ""
+"`%s' qovluğu silinə bilmir:\n"
+"%s"
+
 #: shell/e-storage.c:182 shell/e-storage.c:188
 msgid "(No name)"
 msgstr "( Adsızdır )"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:494
 msgid "No error"
 msgstr "Xəta yoxdur"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:498
 msgid "A folder with the same name already exists"
 msgstr "Eyni adlı bir qovluq onsuz da var"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:500
 msgid "The specified folder type is not valid"
 msgstr "Bildirilən qovluq növü hökmlü deyildir"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:502
 msgid "I/O error"
 msgstr "G/Ç xətası"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:504
 msgid "Not enough space to create the folder"
 msgstr "Qovluğu yaratmaq üçün lazımi disk sahəsi yoxdur"
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:506
 msgid "The specified folder was not found"
 msgstr "Bildirilən qovluq tapıla bilmədi"
 
-#: shell/e-storage.c:503
+#: shell/e-storage.c:508
 msgid "Function not implemented in this storage"
 msgstr "Funksiya yazılmamışdır"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:512
 msgid "Operation not supported"
 msgstr "Əməliyyat dəstəklənmir"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:514
 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:511
+#: shell/e-storage.c:516
 #, fuzzy
 msgid "The specified folder cannot be modified or removed"
 msgstr "Bildirilən qovluq tapıla bilmədi"
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:518
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
@@ -12404,6 +12559,10 @@ msgstr "Ev Sahibi:"
 msgid "The following connections are currently active:"
 msgstr ""
 
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr "Qovluq adı:"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder type:"
 msgstr "Qovluq növü:"
@@ -12460,15 +12619,25 @@ msgid "Evolution Importer Assistant"
 msgstr "\"Evolution\" Alıcı Vasitəsi"
 
 #: shell/importer/import.glade.h:4
-msgid "Import File (Step 2 of 2)"
-msgstr ""
+#, fuzzy
+msgid "Import File (step 3 of 3)"
+msgstr "Fayl seç"
 
 #: shell/importer/import.glade.h:5
+msgid "Importer Type (step 1 of 3)"
+msgstr ""
+
+#: shell/importer/import.glade.h:6
 #, fuzzy
-msgid "Select a File (step 1 of 2)"
+msgid "Select Importers (step 2 of 3)"
 msgstr "Fayl seç"
 
-#: shell/importer/import.glade.h:6
+#: shell/importer/import.glade.h:7
+#, fuzzy
+msgid "Select a File (step 2 of 3)"
+msgstr "Fayl seç"
+
+#: shell/importer/import.glade.h:8
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
@@ -12701,13 +12870,6 @@ msgstr "Əlaqələri a_xtar"
 msgid "_Select All"
 msgstr "Hamısını Se_ç"
 
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:44
-#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
-#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:19
-#: ui/my-evolution.xml.h:9
-msgid "_Tools"
-msgstr "_Vasitələr"
-
 #: ui/evolution-calendar.xml.h:2
 msgid "Configure the calendar's settings"
 msgstr ""
@@ -12898,8 +13060,8 @@ msgstr "Görünüşü %s a(ə)dəyişdir"
 #: 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:49
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:36
 msgid "_File"
 msgstr "_Fayl"
@@ -12920,8 +13082,8 @@ msgstr "Əlaqəni qeyd et və dialoqu qapat"
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:54
-#: ui/evolution-signature-editor.xml.h:11
+#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Save"
 msgstr "_Qeyd Et ..."
 
@@ -13599,6 +13761,11 @@ msgstr "Ekran"
 msgid "_Open Message"
 msgstr "İ_smarıcları Yenidən Göndər"
 
+#: ui/evolution-mail-message.xml.h:98 ui/evolution.xml.h:49
+#: ui/my-evolution.xml.h:9
+msgid "_Tools"
+msgstr "_Vasitələr"
+
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Bu pəncərəni qapat"
@@ -13610,8 +13777,8 @@ msgstr "Bu pəncərəni qapat"
 msgid "_Close"
 msgstr "_Qapat"
 
-#: ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:48
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:50
 msgid "_View"
 msgstr "_Göstər"
 
@@ -13778,37 +13945,32 @@ msgid "_Cc Field"
 msgstr "_Cc Girişi"
 
 #: ui/evolution-message-composer.xml.h:46
-#: ui/evolution-signature-editor.xml.h:6
-msgid "_Debug"
-msgstr "_Ayıqla"
-
-#: ui/evolution-message-composer.xml.h:47
 #, fuzzy
 msgid "_Delete all"
 msgstr "_Sil"
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:49
 msgid "_From Field"
 msgstr "_Göndərən Girişi"
 
-#: ui/evolution-message-composer.xml.h:51
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-signature-editor.xml.h:9
 msgid "_Insert"
 msgstr "_Daxil Et"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:51
 msgid "_Open..."
 msgstr "_Aç ..."
 
-#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Reply-To Field"
 msgstr "_Cavab_Verləcək Girişi"
 
-#: ui/evolution-message-composer.xml.h:55
+#: ui/evolution-message-composer.xml.h:54
 msgid "_Security"
 msgstr "_Təhlükəsizlik"
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "_Kömək"
 
@@ -13958,8 +14120,8 @@ msgid "Exit the program"
 msgstr "Proqramdan çıx"
 
 #: ui/evolution.xml.h:15
-msgid "Import an external file format"
-msgstr "Xarici fayl şəklini idxal et"
+msgid "Import data from other programs"
+msgstr ""
 
 #: ui/evolution.xml.h:17
 #, fuzzy
@@ -14040,8 +14202,8 @@ msgstr "Qovluğa _Get ..."
 
 #: ui/evolution.xml.h:41
 #, fuzzy
-msgid "_Import File..."
-msgstr "Faylı _İdaxl Et ... "
+msgid "_Import..."
+msgstr "Alınır"
 
 #: ui/evolution.xml.h:42
 #, fuzzy
@@ -14058,19 +14220,24 @@ msgstr "_Yeni Qovluq"
 
 #: ui/evolution.xml.h:45
 #, fuzzy
+msgid "_Pilot Settings..."
+msgstr "_Məktub Qurğuları..."
+
+#: ui/evolution.xml.h:46
+#, fuzzy
 msgid "_Rename..."
 msgstr "_Aç ..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:47
 #, fuzzy
 msgid "_Shortcut"
 msgstr "_Qısa Yol Çubuğu"
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:48
 msgid "_Shortcut Bar"
 msgstr "_Qısa Yol Çubuğu"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:51
 #, fuzzy
 msgid "_Work Offline"
 msgstr "Xətdən Qopuq İşlə"
@@ -14175,11 +14342,11 @@ msgstr "MTWTFSS"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:433
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:439
 msgid "Now"
 msgstr "İndi"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:445
 msgid "Today"
 msgstr "Bugün"
 
@@ -14331,21 +14498,59 @@ msgstr "Şəxsi Ünvan Dəftəri Vericisi"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "Şəxsi Ünvan Dəftəri Vericisi; təqvim e'malatxanası"
 
-#: wombat/wombat.c:175
+#: wombat/wombat.c:176
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): GNOME_VFS başladıla bilmədi"
 
-#: wombat/wombat.c:187
+#: wombat/wombat.c:188
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): GNOME başladıla bilmədi"
 
-#: wombat/wombat.c:200
+#: wombat/wombat.c:201
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 
 #, fuzzy
-#~ msgid "Cannot open folder: %s: No such folder"
-#~ msgstr "Qovluq alına bilmədi: %s: %s"
+#~ msgid "_Calendar Information:"
+#~ msgstr "təqvim haqqında"
+
+#~ msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
+#~ msgstr "Üstünlük 'Yüksək', 'Normal', 'Alçaq' və ya 'Təsvirsiz' ola bilər."
+
+#, fuzzy
+#~ msgid "before start of appointment"
+#~ msgstr "iclasın başlanğıcından əvvəl"
+
+#, fuzzy
+#~ msgid "after start of appointment"
+#~ msgstr "iclasın başlanğıcından sonra"
+
+#, fuzzy
+#~ msgid "before end of appointment"
+#~ msgstr "iclas qurtarandan əvvəl"
+
+#, fuzzy
+#~ msgid "Evolution Shortcuts"
+#~ msgstr "\"Evolution\" çubuğu _qısa yolu"
+
+#, fuzzy
+#~ msgid "Each account must have a different name."
+#~ msgstr "Hazırkı faylı fərqli bir ad altında qeyd et"
+
+#, fuzzy
+#~ msgid "Delete folder '%s'"
+#~ msgstr "%s gün sonra sil"
+
+#, fuzzy
+#~ msgid "Rename"
+#~ msgstr "Qayda adı :"
+
+#~ msgid "_Debug"
+#~ msgstr "_Ayıqla"
+
+#, fuzzy
+#~ msgid "_Import File..."
+#~ msgstr "Faylı _İdaxl Et ... "
 
 #~ msgid "Factory for the Evolution addressbook component."
 #~ msgstr "'Evolution'un Ünvan Dəftəri e'malatxanası."
@@ -15150,9 +15355,6 @@ msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 #~ msgid "Renaming old folder and opening"
 #~ msgstr "Köhnə qovluğun adı dəyişdirilir və açılır"
 
-#~ msgid "Copying messages"
-#~ msgstr "İsmarıclar köçürülür"
-
 #~ msgid "Evolution progress"
 #~ msgstr "\"Evolution\"un gedişi"
 
diff --git a/po/bg.po b/po/bg.po
index be275febea..1bca771239 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.9\n"
-"POT-Creation-Date: 2001-09-21 18:31-0400\n"
+"POT-Creation-Date: 2001-10-01 19:06-0400\n"
 "PO-Revision-Date: 2001-09-08 18:35+0200\n"
 "Last-Translator: Nikolay Hristov <geroy@stemo.bg>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
@@ -33,289 +33,289 @@ msgid "Name"
 msgstr "���"
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#, fuzzy
-msgid "Family Name"
-msgstr "����� ���:"
-
-#: addressbook/backend/ebook/e-card-simple.c:61
 #: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Email"
 msgstr "Email"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:61
 #: addressbook/gui/contact-editor/e-contact-editor.c:1609
 msgid "Primary"
 msgstr "�������"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:61
 #, fuzzy
 msgid "Prim"
 msgstr "�������"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:92
 #: addressbook/gui/contact-editor/e-contact-editor.c:1594
 #: addressbook/gui/widgets/e-addressbook-view.c:902
 msgid "Assistant"
 msgstr "��������"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/gui/contact-editor/e-contact-editor.c:1595
 #: addressbook/gui/contact-editor/e-contact-editor.c:1662
 msgid "Business"
 msgstr "������"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/backend/ebook/e-card-simple.c:68
 msgid "Bus"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/gui/contact-editor/e-contact-editor.c:1598
 msgid "Callback"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/gui/contact-editor/e-contact-editor.c:1600
 msgid "Company"
 msgstr "��������"
 
-#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:65
 #, fuzzy
 msgid "Comp"
 msgstr "�������"
 
-#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:69
 #: addressbook/gui/contact-editor/e-contact-editor.c:1601
 #: addressbook/gui/contact-editor/e-contact-editor.c:1663
 msgid "Home"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:67
 #: addressbook/gui/widgets/e-addressbook-view.c:877
 msgid "Organization"
 msgstr "�����������"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:67
 msgid "Org"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/e-contact-editor.c:1605
 msgid "Mobile"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/e-contact-editor.c:1599
 msgid "Car"
 msgstr "����"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/e-contact-editor.c:1597
 #: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "Business Fax"
 msgstr "���. ����"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/backend/ebook/e-card-simple.c:72
 #, fuzzy
 msgid "Bus Fax"
 msgstr "���. ����"
 
-#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/backend/ebook/e-card-simple.c:73
 #: addressbook/gui/contact-editor/e-contact-editor.c:1603
 #: addressbook/gui/widgets/e-addressbook-view.c:883
 msgid "Home Fax"
 msgstr "������� ����"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/e-contact-editor.c:1596
 msgid "Business 2"
 msgstr "������ 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/backend/ebook/e-card-simple.c:74
 #, fuzzy
 msgid "Bus 2"
 msgstr "������ 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/backend/ebook/e-card-simple.c:75
 #: addressbook/gui/contact-editor/e-contact-editor.c:1602
 msgid "Home 2"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/backend/ebook/e-card-simple.c:76
 #: addressbook/gui/contact-editor/e-contact-editor.c:1604
 #: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "ISDN"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/backend/ebook/e-card-simple.c:83
 #: addressbook/gui/contact-editor/e-contact-editor.c:1606
 #: addressbook/gui/contact-editor/e-contact-editor.c:1664
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:52
 msgid "Other"
 msgstr "�����"
 
-#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/backend/ebook/e-card-simple.c:78
 #: addressbook/gui/contact-editor/e-contact-editor.c:1607
 #: addressbook/gui/widgets/e-addressbook-view.c:888
 msgid "Other Fax"
 msgstr "���� ����"
 
-#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/gui/contact-editor/e-contact-editor.c:1608
 #: addressbook/gui/widgets/e-addressbook-view.c:889
 msgid "Pager"
 msgstr "�������"
 
-#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/backend/ebook/e-card-simple.c:80
 #: addressbook/gui/contact-editor/e-contact-editor.c:1610
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 msgid "Radio"
 msgstr "�����"
 
-#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/backend/ebook/e-card-simple.c:81
 #: addressbook/gui/contact-editor/e-contact-editor.c:1611
 #: addressbook/gui/widgets/e-addressbook-view.c:891
 msgid "Telex"
 msgstr "������"
 
-#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/backend/ebook/e-card-simple.c:82
 #: addressbook/gui/widgets/e-addressbook-view.c:892
 msgid "TTY"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/backend/ebook/e-card-simple.c:84
 #: addressbook/gui/component/e-address-popup.c:476
 #: addressbook/gui/contact-editor/e-contact-editor.c:1637
 #: addressbook/gui/widgets/e-addressbook-view.c:894
 msgid "Email 2"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/backend/ebook/e-card-simple.c:85
 #: addressbook/gui/component/e-address-popup.c:486
 #: addressbook/gui/contact-editor/e-contact-editor.c:1638
 #: addressbook/gui/widgets/e-addressbook-view.c:895
 msgid "Email 3"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/widgets/e-addressbook-view.c:896
 msgid "Web Site"
 msgstr "Web ��������"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:86
 msgid "Url"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/widgets/e-addressbook-view.c:897
 msgid "Department"
 msgstr "�����������"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:87
 msgid "Dep"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/backend/ebook/e-card-simple.c:88
 #: addressbook/gui/widgets/e-addressbook-view.c:898
 msgid "Office"
 msgstr "����"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/backend/ebook/e-card-simple.c:88
 #, fuzzy
 msgid "Off"
 msgstr "����"
 
-#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card-simple.c:89
 #: addressbook/gui/widgets/e-addressbook-view.c:899
 msgid "Title"
 msgstr "�����"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:90
 #: addressbook/gui/widgets/e-addressbook-view.c:900
 msgid "Profession"
 msgstr "��������"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Prof"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:91
 #: addressbook/gui/widgets/e-addressbook-view.c:901
 msgid "Manager"
 msgstr "��������"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:91
 #, fuzzy
 msgid "Man"
 msgstr "���"
 
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:92
 msgid "Ass"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card-simple.c:93
 #: addressbook/gui/widgets/e-addressbook-view.c:903
 msgid "Nickname"
 msgstr "������"
 
-#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card-simple.c:93
 #, fuzzy
 msgid "Nick"
 msgstr "������"
 
-#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/backend/ebook/e-card-simple.c:94
 #: addressbook/gui/widgets/e-addressbook-view.c:904
 msgid "Spouse"
 msgstr "������(�)"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card-simple.c:95
 #: addressbook/gui/widgets/e-addressbook-view.c:905
 msgid "Note"
 msgstr "�������"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:96
 #, fuzzy
 msgid "Calendar URI"
 msgstr "��������"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:96
 msgid "CALUri"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:97
 #: addressbook/gui/widgets/e-addressbook-view.c:906
 msgid "Free-busy URL"
 msgstr "Free-busy �����"
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:97
 msgid "FBUrl"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:98
 #, fuzzy
 msgid "Anniversary"
 msgstr "���������:"
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "Anniv"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card-simple.c:99
 #, fuzzy
 msgid "Birth Date"
 msgstr ""
 "\n"
 "���� �� �������: "
 
-#: addressbook/backend/ebook/e-card-simple.c:103
+#: addressbook/backend/ebook/e-card-simple.c:102
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "���������"
 
+#: addressbook/backend/ebook/e-card-simple.c:103
+#, fuzzy
+msgid "Family Name"
+msgstr "����� ���:"
+
 #: addressbook/backend/ebook/e-card.c:3564
 msgid "Card: "
 msgstr ""
@@ -593,10 +593,10 @@ msgstr "���������� ������ �� %s"
 #: 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:1119
+#: addressbook/conduit/address-conduit.c:1167
 #: addressbook/gui/component/addressbook-factory.c:48
-#: calendar/conduits/calendar/calendar-conduit.c:1204
-#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/conduits/calendar/calendar-conduit.c:1262
+#: calendar/conduits/todo/todo-conduit.c:1034
 #: calendar/gui/alarm-notify/notify-main.c:78 calendar/gui/main.c:63
 msgid "Could not initialize Bonobo"
 msgstr "�� ���� �� ������������� Bonobo"
@@ -660,20 +660,20 @@ msgstr "Cursor �� ���� �� ���� �������\n"
 msgid "EBook not loaded\n"
 msgstr "EBook �� � �������\n"
 
-#: addressbook/conduit/address-conduit.c:681
-#: calendar/conduits/calendar/calendar-conduit.c:778
-#: calendar/conduits/todo/todo-conduit.c:592
+#: addressbook/conduit/address-conduit.c:731
+#: calendar/conduits/calendar/calendar-conduit.c:837
+#: calendar/conduits/todo/todo-conduit.c:609
 msgid "Could not start wombat server"
 msgstr "�� ���� �� ��������� wombat ������"
 
-#: addressbook/conduit/address-conduit.c:682
-#: calendar/conduits/calendar/calendar-conduit.c:779
-#: calendar/conduits/todo/todo-conduit.c:593
+#: addressbook/conduit/address-conduit.c:732
+#: calendar/conduits/calendar/calendar-conduit.c:838
+#: calendar/conduits/todo/todo-conduit.c:610
 msgid "Could not start wombat"
 msgstr "�� ���� �� ��������� wombat"
 
-#: addressbook/conduit/address-conduit.c:714
-#: addressbook/conduit/address-conduit.c:717
+#: addressbook/conduit/address-conduit.c:762
+#: addressbook/conduit/address-conduit.c:765
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -718,8 +718,8 @@ msgid "Factory for the sample Addressbook control"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:66
-#: calendar/gui/dialogs/comp-editor-util.c:281
-#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:173
+#: calendar/gui/dialogs/comp-editor-util.c:289
+#: calendar/gui/dialogs/comp-editor-util.c:345 shell/e-local-storage.c:173
 #: shell/e-shortcuts.c:1062
 #, fuzzy
 msgid "Contacts"
@@ -740,23 +740,23 @@ msgstr "LDAP ������"
 msgid "LDAP server containing contact information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:386
+#: addressbook/gui/component/addressbook-component.c:411
 #: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "New Contact"
 msgstr "��� �������"
 
-#: addressbook/gui/component/addressbook-component.c:386
+#: addressbook/gui/component/addressbook-component.c:411
 #, fuzzy
 msgid "New _Contact"
 msgstr "��� �������"
 
-#: addressbook/gui/component/addressbook-component.c:387
+#: addressbook/gui/component/addressbook-component.c:412
 #, fuzzy
 msgid "New Contact List"
 msgstr "��� �������"
 
-#: addressbook/gui/component/addressbook-component.c:387
+#: addressbook/gui/component/addressbook-component.c:412
 #, fuzzy
 msgid "New Contact _List"
 msgstr "��� �������"
@@ -864,19 +864,19 @@ msgid "_Account name:"
 msgstr "��� �� �����:"
 
 #: addressbook/gui/component/addressbook-config.glade.h:22
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: 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:90 my-evolution/my-evolution.glade.h:20
+#: mail/mail-config.glade.h:91 my-evolution/my-evolution.glade.h:20
 msgid "_Add"
 msgstr "���_���"
 
 #: addressbook/gui/component/addressbook-config.glade.h:23
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:95
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:96
 #: ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
 #: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
 msgstr "_��������"
@@ -900,36 +900,36 @@ msgstr "��� ������:"
 msgid "Other Contacts"
 msgstr "����� ��������"
 
-#: addressbook/gui/component/addressbook.c:393
+#: addressbook/gui/component/addressbook.c:407
 #, fuzzy, c-format
 msgid "Please enter your email address and password for access to %s"
 msgstr "���� �������� NNTP ������ �� %s@%s"
 
-#: addressbook/gui/component/addressbook.c:401
+#: addressbook/gui/component/addressbook.c:415
 #, fuzzy
 msgid "LDAP Authentication"
 msgstr "�������������"
 
-#: addressbook/gui/component/addressbook.c:412
+#: addressbook/gui/component/addressbook.c:426
 msgid "Email Address:"
 msgstr "Email �����:"
 
-#: addressbook/gui/component/addressbook.c:425
+#: addressbook/gui/component/addressbook.c:439
 msgid "Password:"
 msgstr "������:"
 
-#: addressbook/gui/component/addressbook.c:488
+#: addressbook/gui/component/addressbook.c:502
 msgid "Unable to open addressbook"
 msgstr "�� ���� �� ������ ��������� �����"
 
-#: addressbook/gui/component/addressbook.c:495
+#: addressbook/gui/component/addressbook.c:509
 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:500
+#: addressbook/gui/component/addressbook.c:514
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -937,45 +937,45 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:508
+#: addressbook/gui/component/addressbook.c:522
 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:649
+#: addressbook/gui/component/addressbook.c:663
 #: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "����� ���� �������"
 
-#: addressbook/gui/component/addressbook.c:650
+#: addressbook/gui/component/addressbook.c:664
 msgid "Name contains"
 msgstr "��� �������"
 
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:665
 msgid "Email contains"
 msgstr "Email �������"
 
-#: addressbook/gui/component/addressbook.c:652
+#: addressbook/gui/component/addressbook.c:666
 #: calendar/gui/cal-search-bar.c:59
 #, fuzzy
 msgid "Category is"
 msgstr "���������"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:653 widgets/misc/e-filter-bar.h:97
+#: addressbook/gui/component/addressbook.c:667 widgets/misc/e-filter-bar.h:97
 #: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:883
+#: addressbook/gui/component/addressbook.c:897
 #: calendar/gui/cal-search-bar.c:412
 #, fuzzy
 msgid "Any Category"
 msgstr "���������:"
 
-#: addressbook/gui/component/addressbook.c:925
+#: addressbook/gui/component/addressbook.c:939
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
@@ -990,7 +990,7 @@ msgid "(none)"
 msgstr "(���� ���)"
 
 #: addressbook/gui/component/e-address-popup.c:466
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #: addressbook/gui/contact-editor/e-contact-editor.c:1636
 msgid "Primary Email"
 msgstr "������� Email"
@@ -1173,120 +1173,127 @@ msgstr "�������"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
 #, fuzzy
+msgid "F_ree/Busy URL:"
+msgstr "Free-busy �����"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#, fuzzy
 msgid "File A_s:"
 msgstr "���� ����:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "General"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+msgid ""
+"If this person publishes free/busy or other calendar information on the "
+"Internet, enter the address\n"
+"of that information here."
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "New phone type"
 msgstr "��� ��� �������"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "No_tes:"
 msgstr "�������"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #, fuzzy
 msgid "Organi_zation:"
 msgstr "�����������:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "Phone Types"
 msgstr "��� �������"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "Wants to receive _HTML mail"
 msgstr "����� �� ��������� _HTML mail"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Address..."
 msgstr "_�����..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "_Assistant's name:"
 msgstr "��� �� ��������:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Birthday:"
 msgstr "���� �� �������:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Business"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#, fuzzy
-msgid "_Calendar Information:"
-msgstr "���������� ����������"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 #: calendar/gui/dialogs/event-page.glade.h:12
 #: calendar/gui/dialogs/task-page.glade.h:10
 msgid "_Contacts..."
 msgstr "��������..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:834 filter/filter.glade.h:8
-#: mail/folder-browser.c:1371 mail/mail-config.glade.h:94
+#: mail/folder-browser.c:1406 mail/mail-config.glade.h:95
 #: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "������"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Department:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#, fuzzy
-msgid "_Free/Busy Information:"
-msgstr "������������� ����������"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Full Name..."
 msgstr "����� ���..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Home"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Job title:"
 msgstr "������:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Manager's Name:"
 msgstr "��� �� ��������:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Mobile"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Nickname:"
 msgstr "������:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Office:"
 msgstr "_����:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Profession:"
 msgstr "_��������:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#, fuzzy
+msgid "_Public Calendar URL:"
+msgstr "��������"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Spouse:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_This is the mailing address"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "_Web page address:"
 msgstr "Web �����:"
@@ -2524,7 +2531,7 @@ msgstr " %d �������"
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
 #: addressbook/gui/widgets/e-addressbook-view.c:691
 #: addressbook/gui/widgets/e-addressbook-view.c:753
-#: addressbook/gui/widgets/e-addressbook-view.c:1373
+#: addressbook/gui/widgets/e-addressbook-view.c:1422
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "������� ���� VCard"
@@ -2582,8 +2589,8 @@ msgid "Success"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1710
-#: shell/e-storage.c:515
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1702
+#: shell/e-storage.c:520
 msgid "Unknown error"
 msgstr "���������� ������"
 
@@ -2591,7 +2598,7 @@ msgstr "���������� ������"
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:505
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:510
 msgid "Permission denied"
 msgstr "������� ������"
 
@@ -2609,10 +2616,10 @@ msgid "Protocol not supported"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:733 calendar/gui/calendar-model.c:1274
+#: calendar/gui/calendar-model.c:726 calendar/gui/calendar-model.c:1247
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:544
-#: camel/camel-service.c:580
+#: calendar/gui/e-calendar-table.c:461 camel/camel-service.c:598
+#: camel/camel-service.c:634
 msgid "Cancelled"
 msgstr "����������"
 
@@ -2642,7 +2649,7 @@ msgid "Error removing list"
 msgstr "������ ��� ����������� �� %s"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1248
+#: addressbook/gui/widgets/e-addressbook-view.c:1297
 #, fuzzy
 msgid "Error removing card"
 msgstr ""
@@ -2931,8 +2938,8 @@ msgstr "�����..."
 msgid "Print cards"
 msgstr "��������� ����������"
 
-#: addressbook/printing/e-contact-print.c:1112
-#: addressbook/printing/e-contact-print.c:1134
+#: addressbook/printing/e-contact-print.c:1152
+#: addressbook/printing/e-contact-print.c:1174
 #, fuzzy
 msgid "Print card"
 msgstr "��������� ����������"
@@ -2943,18 +2950,44 @@ msgstr "��������� ����������"
 msgid "Print envelope"
 msgstr "������� �������"
 
-#: calendar/conduits/calendar/calendar-conduit.c:735
-#: calendar/conduits/todo/todo-conduit.c:548
+#: calendar/cal-util/cal-util.c:418 calendar/cal-util/cal-util.c:440
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:385 mail/message-list.c:652
+msgid "High"
+msgstr ""
+
+#: calendar/cal-util/cal-util.c:420 calendar/cal-util/cal-util.c:442
+#: calendar/gui/calendar-model.c:1673
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:386 mail/message-list.c:651
+msgid "Normal"
+msgstr ""
+
+#: calendar/cal-util/cal-util.c:422 calendar/cal-util/cal-util.c:444
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:387 mail/message-list.c:650
+msgid "Low"
+msgstr ""
+
+#. An empty string is the same as 'None'.
+#: calendar/cal-util/cal-util.c:438
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:388
+msgid "Undefined"
+msgstr "������������"
+
+#: calendar/conduits/calendar/calendar-conduit.c:793
+#: calendar/conduits/todo/todo-conduit.c:564
 msgid "Error while communicating with calendar server"
 msgstr "������ ��� ������������� � ����������� ������"
 
-#: calendar/conduits/calendar/calendar-conduit.c:839
-#: calendar/conduits/calendar/calendar-conduit.c:842
+#: calendar/conduits/calendar/calendar-conduit.c:896
+#: calendar/conduits/calendar/calendar-conduit.c:899
 msgid "Could not read pilot's Calendar application block"
 msgstr "�� ���� �� ������� ��������� �� pilot"
 
-#: calendar/conduits/todo/todo-conduit.c:653
-#: calendar/conduits/todo/todo-conduit.c:656
+#: calendar/conduits/todo/todo-conduit.c:668
+#: calendar/conduits/todo/todo-conduit.c:671
 msgid "Could not read pilot's ToDo application block"
 msgstr "�� ���� �� ������� �������� ��� ������ �� pilot"
 
@@ -3002,47 +3035,47 @@ msgstr ""
 msgid "Factory for the alarm notification service"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:152
 #, fuzzy, c-format
 msgid "Notification about your appointment starting on %s and ending on %s"
 msgstr "��������� �� ������ ����� �� %A %b %d %Y %H:%M"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:156
 #, fuzzy, c-format
 msgid "Notification about your appointment starting on %s"
 msgstr "��������� �� ������ ����� �� %A %b %d %Y %H:%M"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:161
 #, fuzzy, c-format
 msgid "Notification about your appointment ending on %s"
 msgstr "��������� �� ������ ����� �� %A %b %d %Y %H:%M"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:165
 #, fuzzy
 msgid "Notification about your appointment"
 msgstr "��������� �� ������ ����� �� %A %b %d %Y %H:%M"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:172
 #, fuzzy, c-format
 msgid "Notification about your task starting on %s and ending on %s"
 msgstr "��������� �� ������ ����� �� %A %b %d %Y %H:%M"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:176
 #, fuzzy, c-format
 msgid "Notification about your task starting on %s"
 msgstr "��������� �� ������ ����� �� %A %b %d %Y %H:%M"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:181
 #, fuzzy, c-format
 msgid "Notification about your task ending on %s"
 msgstr "��������� �� ������ ����� �� %A %b %d %Y %H:%M"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:185
 #, fuzzy
 msgid "Notification about your task"
 msgstr "������ ���������� ������� Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:267
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "������ �� %A %b %d %Y %H:%M"
 
@@ -3129,7 +3162,7 @@ msgstr ""
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: calendar/gui/calendar-commands.c:467
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1442
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1446
 msgid "%d %B"
 msgstr ""
 
@@ -3140,17 +3173,17 @@ msgstr ""
 "�� ���� �� ������ ���������� ������. ���� ��������� ����������� �� ORBit � "
 "OAF"
 
-#: calendar/gui/calendar-model.c:399 calendar/gui/calendar-model.c:1001
-#: calendar/gui/e-calendar-table.c:307
+#: calendar/gui/calendar-model.c:399 calendar/gui/calendar-model.c:994
+#: calendar/gui/e-calendar-table.c:364
 msgid "Private"
 msgstr "������"
 
-#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:1003
-#: calendar/gui/e-calendar-table.c:308
+#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:996
+#: calendar/gui/e-calendar-table.c:365
 msgid "Confidential"
 msgstr "��������������"
 
-#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:306
+#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:363
 msgid "Public"
 msgstr "��������"
 
@@ -3170,68 +3203,49 @@ msgstr ""
 msgid "W"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:538 calendar/gui/calendar-model.c:1183
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:652
-msgid "High"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1185
-#: calendar/gui/calendar-model.c:1700
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:651
-msgid "Normal"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:542 calendar/gui/calendar-model.c:1187
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:650
-msgid "Low"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:573 calendar/gui/calendar-model.c:1220
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/calendar-model.c:566 calendar/gui/calendar-model.c:1193
+#: calendar/gui/e-calendar-table.c:437
 #, fuzzy
 msgid "Free"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:575 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/calendar-model.c:568 calendar/gui/e-calendar-table.c:438
 #: calendar/gui/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:724 calendar/gui/calendar-model.c:1268
+#: calendar/gui/calendar-model.c:717 calendar/gui/calendar-model.c:1241
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:401
+#: calendar/gui/e-calendar-table.c:458
 msgid "Not Started"
 msgstr "�� � ���������"
 
-#: calendar/gui/calendar-model.c:727 calendar/gui/calendar-model.c:1270
+#: calendar/gui/calendar-model.c:720 calendar/gui/calendar-model.c:1243
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:402
+#: calendar/gui/e-calendar-table.c:459
 msgid "In Progress"
 msgstr "� �������"
 
-#: calendar/gui/calendar-model.c:730 calendar/gui/calendar-model.c:1272
+#: calendar/gui/calendar-model.c:723 calendar/gui/calendar-model.c:1245
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-meeting-model.c:298
+#: calendar/gui/e-calendar-table.c:460 calendar/gui/e-meeting-model.c:298
 #: calendar/gui/e-meeting-model.c:321
 msgid "Completed"
 msgstr "����������"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:915 e-util/e-time-utils.c:163
+#: calendar/gui/calendar-model.c:908 e-util/e-time-utils.c:163
 #: e-util/e-time-utils.c:354
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr ""
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:918 e-util/e-time-utils.c:158
+#: calendar/gui/calendar-model.c:911 e-util/e-time-utils.c:158
 #: e-util/e-time-utils.c:363
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:923
+#: calendar/gui/calendar-model.c:916
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -3242,7 +3256,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:1087
+#: calendar/gui/calendar-model.c:1080
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3252,48 +3266,37 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1127
+#: calendar/gui/calendar-model.c:1120
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "���������� �� ���������� ������ �� � ����� 0 � 100, �����������"
 
-#: calendar/gui/calendar-model.c:1168
-msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
-msgstr ""
-
-#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1181
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:331
-msgid "Undefined"
-msgstr "������������"
-
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1266 calendar/gui/dialogs/meeting-page.c:332
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1444
+#: calendar/gui/calendar-model.c:1239 calendar/gui/dialogs/meeting-page.c:332
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1446
 #: mail/mail-accounts.c:143 mail/mail-accounts.c:390
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:50
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:203
-#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
-#: widgets/misc/e-dateedit.c:1428 widgets/misc/e-dateedit.c:1543
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:453
+#: widgets/misc/e-dateedit.c:1453 widgets/misc/e-dateedit.c:1568
 msgid "None"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1702
+#: calendar/gui/calendar-model.c:1675
 #, fuzzy
 msgid "Recurring"
 msgstr "����������"
 
-#: calendar/gui/calendar-model.c:1704
+#: calendar/gui/calendar-model.c:1677
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1710 calendar/gui/e-meeting-model.c:270
+#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:270
 #: calendar/gui/e-meeting-model.c:280 calendar/gui/e-meeting-model.c:506
 #: calendar/gui/e-meeting-model.c:702
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1710 calendar/gui/e-meeting-model.c:282
+#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:282
 #: calendar/gui/e-meeting-model.c:703
 #, fuzzy
 msgid "No"
@@ -3338,41 +3341,41 @@ msgstr "��� �������"
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/component-factory.c:62 my-evolution/my-evolution.glade.h:6
+#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:6
 #: shell/e-local-storage.c:172 shell/e-shortcuts.c:1056
 msgid "Calendar"
 msgstr "��������"
 
-#: calendar/gui/component-factory.c:63
+#: calendar/gui/component-factory.c:64
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/component-factory.c:67 calendar/gui/print.c:1719
-#: my-evolution/e-summary-tasks.c:215 my-evolution/e-summary-tasks.c:231
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1723
+#: my-evolution/e-summary-tasks.c:237 my-evolution/e-summary-tasks.c:253
 #: shell/e-local-storage.c:178 shell/e-shortcuts.c:1059
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr ""
 
-#: calendar/gui/component-factory.c:68
+#: calendar/gui/component-factory.c:69
 msgid "Folder containing to-do items"
 msgstr ""
 
-#: calendar/gui/component-factory.c:593 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:581 ui/evolution-calendar.xml.h:7
 msgid "Create a new appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:594 calendar/gui/e-day-view.c:3420
+#: calendar/gui/component-factory.c:582 calendar/gui/e-day-view.c:3422
 #, fuzzy
 msgid "New _Appointment"
 msgstr "���� �����"
 
-#: calendar/gui/component-factory.c:599 ui/evolution-calendar.xml.h:8
+#: calendar/gui/component-factory.c:587 ui/evolution-calendar.xml.h:8
 #: ui/evolution-tasks.xml.h:5
 msgid "Create a new task"
 msgstr ""
 
-#: calendar/gui/component-factory.c:600
+#: calendar/gui/component-factory.c:588
 #, fuzzy
 msgid "New _Task"
 msgstr "������"
@@ -3453,105 +3456,126 @@ msgstr "������"
 msgid "minutes"
 msgstr "������"
 
-#: calendar/gui/dialogs/alarm-page.c:303
+#: calendar/gui/dialogs/alarm-page.c:307
 #, fuzzy, c-format
 msgid "%d days"
 msgstr " %d ���"
 
-#: calendar/gui/dialogs/alarm-page.c:305
+#: calendar/gui/dialogs/alarm-page.c:310
 #, fuzzy
 msgid "1 day"
 msgstr " 1 ���"
 
-#: calendar/gui/dialogs/alarm-page.c:308
+#: calendar/gui/dialogs/alarm-page.c:315
 #, fuzzy, c-format
 msgid "%d weeks"
 msgstr " %d �������"
 
-#: calendar/gui/dialogs/alarm-page.c:310
+#: calendar/gui/dialogs/alarm-page.c:318
 #, fuzzy
 msgid "1 week"
 msgstr " 1 �������"
 
-#: calendar/gui/dialogs/alarm-page.c:313
+#: calendar/gui/dialogs/alarm-page.c:323
 #, fuzzy, c-format
 msgid "%d hours"
 msgstr " %d ������"
 
-#: calendar/gui/dialogs/alarm-page.c:315
+#: calendar/gui/dialogs/alarm-page.c:326
 #, fuzzy
 msgid "1 hour"
 msgstr " 1 ���"
 
-#: calendar/gui/dialogs/alarm-page.c:318
+#: calendar/gui/dialogs/alarm-page.c:331
 #, fuzzy, c-format
 msgid "%d minutes"
 msgstr " %d ������"
 
-#: calendar/gui/dialogs/alarm-page.c:320
+#: calendar/gui/dialogs/alarm-page.c:334
 #, fuzzy
 msgid "1 minute"
 msgstr " 1 ������"
 
-#: calendar/gui/dialogs/alarm-page.c:323
+#: calendar/gui/dialogs/alarm-page.c:339
 #, fuzzy, c-format
 msgid "%d seconds"
 msgstr " %d �������"
 
-#: calendar/gui/dialogs/alarm-page.c:325
+#: calendar/gui/dialogs/alarm-page.c:342
 #, fuzzy
 msgid "1 second"
 msgstr " 1 �������"
 
-#: calendar/gui/dialogs/alarm-page.c:350
+#: calendar/gui/dialogs/alarm-page.c:373
 #: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:354
+#: calendar/gui/dialogs/alarm-page.c:377
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 #, fuzzy
 msgid "Display a message"
 msgstr "_Mail ���������"
 
-#: calendar/gui/dialogs/alarm-page.c:358
+#: calendar/gui/dialogs/alarm-page.c:381
 msgid "Send an email"
 msgstr "������� email"
 
-#: calendar/gui/dialogs/alarm-page.c:362
+#: calendar/gui/dialogs/alarm-page.c:385
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "��������� ��������"
 
-#: calendar/gui/dialogs/alarm-page.c:368 calendar/gui/dialogs/alarm-page.c:404
-#: calendar/gui/e-meeting-model.c:226 calendar/gui/e-meeting-model.c:261
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:674
-#: calendar/gui/e-meeting-model.c:690
-#: camel/providers/smtp/camel-smtp-transport.c:224
-#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
-msgid "Unknown"
-msgstr "����������"
-
-#: calendar/gui/dialogs/alarm-page.c:380
+#: calendar/gui/dialogs/alarm-page.c:391
 #, fuzzy
-msgid "before start of appointment"
+msgid "Unknown action to be performed"
+msgstr "���������� ������"
+
+#: calendar/gui/dialogs/alarm-page.c:403
+#, fuzzy, c-format
+msgid "%s %s before the start of the appointment"
 msgstr " ���� �������� �� �������"
 
-#: calendar/gui/dialogs/alarm-page.c:383
-#, fuzzy
-msgid "after start of appointment"
+#: calendar/gui/dialogs/alarm-page.c:406
+#, fuzzy, c-format
+msgid "%s %s after the start of the appointment"
 msgstr " ���� �������� �� �������"
 
-#: calendar/gui/dialogs/alarm-page.c:393
-#, fuzzy
-msgid "before end of appointment"
-msgstr " ����� ���� �� �������"
+#: calendar/gui/dialogs/alarm-page.c:411
+#, fuzzy, c-format
+msgid "%s at the start of the appointment"
+msgstr " ���� �������� �� �������"
 
-#: calendar/gui/dialogs/alarm-page.c:396
-#, fuzzy
-msgid "after end of appointment"
+#: calendar/gui/dialogs/alarm-page.c:420
+#, fuzzy, c-format
+msgid "%s %s before the end of the appointment"
+msgstr " ���� �������� �� �������"
+
+#: calendar/gui/dialogs/alarm-page.c:423
+#, fuzzy, c-format
+msgid "%s %s after the end of the appointment"
 msgstr " ���� ���� �� �������"
 
+#: calendar/gui/dialogs/alarm-page.c:428
+#, fuzzy, c-format
+msgid "%s at the end of the appointment"
+msgstr " ���� ���� �� �������"
+
+#: calendar/gui/dialogs/alarm-page.c:439
+#, fuzzy, c-format
+msgid "%s at an unknown time"
+msgstr "���������� ������"
+
+#: calendar/gui/dialogs/alarm-page.c:445
+#, fuzzy, c-format
+msgid "%s at %s"
+msgstr "%s ������ %s"
+
+#: calendar/gui/dialogs/alarm-page.c:452
+#, c-format
+msgid "%s for an unknown trigger type"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 #, fuzzy
@@ -3899,59 +3923,59 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:159 calendar/gui/print.c:2128
+#: calendar/gui/dialogs/comp-editor-util.c:167 calendar/gui/print.c:2132
 #, fuzzy
 msgid " to "
 msgstr "����� �"
 
-#: calendar/gui/dialogs/comp-editor-util.c:163 calendar/gui/print.c:2132
+#: calendar/gui/dialogs/comp-editor-util.c:171 calendar/gui/print.c:2136
 #, fuzzy
 msgid " (Completed "
 msgstr "����������"
 
-#: calendar/gui/dialogs/comp-editor-util.c:165 calendar/gui/print.c:2134
+#: calendar/gui/dialogs/comp-editor-util.c:173 calendar/gui/print.c:2138
 #, fuzzy
 msgid "Completed "
 msgstr "����������"
 
-#: calendar/gui/dialogs/comp-editor-util.c:170 calendar/gui/print.c:2139
+#: calendar/gui/dialogs/comp-editor-util.c:178 calendar/gui/print.c:2143
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2141
+#: calendar/gui/dialogs/comp-editor-util.c:180 calendar/gui/print.c:2145
 #, fuzzy
 msgid "Due "
 msgstr "����"
 
-#: calendar/gui/dialogs/comp-editor.c:515
+#: calendar/gui/dialogs/comp-editor.c:521
 msgid "Edit Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:520
+#: calendar/gui/dialogs/comp-editor.c:526
 #, c-format
 msgid "Appointment - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:523
+#: calendar/gui/dialogs/comp-editor.c:529
 #, c-format
 msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:526
+#: calendar/gui/dialogs/comp-editor.c:532
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:540
+#: calendar/gui/dialogs/comp-editor.c:546
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:950 mail/mail-callbacks.c:1662
+#: calendar/gui/dialogs/comp-editor.c:952 mail/mail-callbacks.c:1671
 #: mail/mail-display.c:100
 msgid "Overwrite file?"
 msgstr "������������ �� ����?"
 
-#: calendar/gui/dialogs/comp-editor.c:954 mail/mail-callbacks.c:1668
+#: calendar/gui/dialogs/comp-editor.c:956 mail/mail-callbacks.c:1677
 #: mail/mail-display.c:104
 msgid ""
 "A file by that name already exists.\n"
@@ -3960,53 +3984,53 @@ msgstr ""
 "���� ��� ������ ��� ���� ����������.\n"
 "�� �� ��������� ��?"
 
-#: calendar/gui/dialogs/comp-editor.c:1017 ui/evolution-comp-editor.xml.h:13
+#: calendar/gui/dialogs/comp-editor.c:1019 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "������� ����..."
 
-#: calendar/gui/dialogs/comp-editor.c:1170
+#: calendar/gui/dialogs/comp-editor.c:1172
 msgid "Unable to obtain current version!"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:90
+#: calendar/gui/dialogs/delete-comp.c:91
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:93
+#: calendar/gui/dialogs/delete-comp.c:94
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:100
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:102
+#: calendar/gui/dialogs/delete-comp.c:103
 msgid "Are you sure you want to delete this untitled task?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:109
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:111
+#: calendar/gui/dialogs/delete-comp.c:112
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:126
+#: calendar/gui/dialogs/delete-comp.c:127
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:131
+#: calendar/gui/dialogs/delete-comp.c:132
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:136
+#: calendar/gui/dialogs/delete-comp.c:137
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr ""
@@ -4202,7 +4226,7 @@ msgstr "������"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:18
-#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:85
+#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:86
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "���"
@@ -4224,8 +4248,8 @@ msgstr ""
 msgid "_Other Organizer"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:422 calendar/gui/print.c:1851
-#: calendar/gui/print.c:1853 calendar/gui/print.c:1854
+#: calendar/gui/dialogs/recurrence-page.c:422 calendar/gui/print.c:1855
+#: calendar/gui/print.c:1857 calendar/gui/print.c:1858
 msgid "%a %b %d %Y"
 msgstr ""
 
@@ -4347,7 +4371,7 @@ msgid "Progress"
 msgstr "� �������"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:910
+#: my-evolution/e-summary-preferences.c:949
 msgid "URL:"
 msgstr ""
 
@@ -4367,7 +4391,7 @@ msgstr "��������"
 
 #: calendar/gui/dialogs/task-page.glade.h:4
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:28
 msgid "Description:"
 msgstr "��������:"
 
@@ -4383,108 +4407,108 @@ msgstr ""
 msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:350
+#: calendar/gui/e-calendar-table.c:407
 #, c-format
 msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:351
+#: calendar/gui/e-calendar-table.c:408
 #, c-format
 msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:409
 #, c-format
 msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:410
 #, c-format
 msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:411
 #, c-format
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:412
 #, c-format
 msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:356
+#: calendar/gui/e-calendar-table.c:413
 #, c-format
 msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:357
+#: calendar/gui/e-calendar-table.c:414
 #, c-format
 msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:358
+#: calendar/gui/e-calendar-table.c:415
 #, c-format
 msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:359
+#: calendar/gui/e-calendar-table.c:416
 #, c-format
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:360
+#: calendar/gui/e-calendar-table.c:417
 #, c-format
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3441
-#: calendar/gui/e-week-view.c:3288 mail/folder-browser.c:1336
+#: calendar/gui/e-calendar-table.c:914 calendar/gui/e-day-view.c:3443
+#: calendar/gui/e-week-view.c:3296 mail/folder-browser.c:1371
 #: shell/e-shortcuts-view.c:385
 #, fuzzy
 msgid "_Open"
 msgstr "������"
 
-#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3450
-#: calendar/gui/e-week-view.c:3297 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:918 calendar/gui/e-day-view.c:3452
+#: calendar/gui/e-week-view.c:3305 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:856 calendar/gui/e-day-view.c:3452
-#: calendar/gui/e-week-view.c:3299 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:920 calendar/gui/e-day-view.c:3454
+#: calendar/gui/e-week-view.c:3307 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:14
 msgid "_Copy"
 msgstr "�������"
 
-#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3427
-#: calendar/gui/e-day-view.c:3454 calendar/gui/e-week-view.c:3275
-#: calendar/gui/e-week-view.c:3301 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:922 calendar/gui/e-day-view.c:3429
+#: calendar/gui/e-day-view.c:3456 calendar/gui/e-week-view.c:3283
+#: calendar/gui/e-week-view.c:3309 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:40 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:17
 msgid "_Paste"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:863
+#: calendar/gui/e-calendar-table.c:927
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "% ����������:"
 
-#: calendar/gui/e-calendar-table.c:865
+#: calendar/gui/e-calendar-table.c:929
 #, fuzzy
 msgid "_Delete this Task"
 msgstr "������ ���� ���������"
 
-#: calendar/gui/e-calendar-table.c:868
+#: calendar/gui/e-calendar-table.c:932
 msgid "_Mark Tasks as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:870
+#: calendar/gui/e-calendar-table.c:934
 msgid "_Delete Selected Tasks"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1130
+#: calendar/gui/e-calendar-table.c:1194
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr ""
@@ -4493,8 +4517,8 @@ msgstr ""
 msgid "Alarms"
 msgstr "������"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:702
-#: camel/camel-filter-driver.c:819
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:718
+#: camel/camel-filter-driver.c:834
 #, fuzzy
 msgid "Complete"
 msgstr "����������."
@@ -4526,8 +4550,8 @@ 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:30 shell/e-shortcuts.c:1050
-#: shell/e-storage-set-view.c:1424 shell/e-summary-storage.c:80
+#: my-evolution/component-factory.c:45 shell/e-shortcuts.c:1050
+#: shell/e-storage-set-view.c:1420 shell/e-summary-storage.c:80
 msgid "Summary"
 msgstr ""
 
@@ -4548,7 +4572,7 @@ 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:285 calendar/gui/e-day-view.c:1374
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1458
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
 msgid "%A %d %B"
 msgstr ""
 
@@ -4560,294 +4584,311 @@ msgid "%d %b"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:608 calendar/gui/e-week-view.c:344
-#: calendar/gui/print.c:765
+#: calendar/gui/e-day-view.c:608 calendar/gui/e-week-view.c:345
+#: calendar/gui/print.c:769
 msgid "am"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:347
-#: calendar/gui/print.c:767
+#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:348
+#: calendar/gui/print.c:771
 msgid "pm"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3422 calendar/gui/e-week-view.c:3270
+#: calendar/gui/e-day-view.c:3424 calendar/gui/e-week-view.c:3278
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3432 calendar/gui/e-week-view.c:3280
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3288
 #: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3282
+#: calendar/gui/e-day-view.c:3436 calendar/gui/e-week-view.c:3290
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "����� � �����..."
 
-#: calendar/gui/e-day-view.c:3443 calendar/gui/e-week-view.c:3290
+#: calendar/gui/e-day-view.c:3445 calendar/gui/e-week-view.c:3298
 #, fuzzy
 msgid "_Delete this Appointment"
 msgstr "������ ���� ���������"
 
-#: calendar/gui/e-day-view.c:3462 calendar/gui/e-week-view.c:3315
+#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3323
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "������� ������� ����"
 
-#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3317
+#: calendar/gui/e-day-view.c:3466 calendar/gui/e-week-view.c:3325
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "������ ���� ���������"
 
-#: calendar/gui/e-day-view.c:3466 calendar/gui/e-week-view.c:3319
+#: calendar/gui/e-day-view.c:3468 calendar/gui/e-week-view.c:3327
 msgid "Delete _All Occurrences"
 msgstr ""
 
+#: calendar/gui/e-itip-control.c:469
+msgid "Meeting begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:474
+msgid "Task begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:479
+#, fuzzy
+msgid "Free/Busy info begins: <b>"
+msgstr "������������� ����������"
+
+#: calendar/gui/e-itip-control.c:483
+msgid "Begins: <b>"
+msgstr ""
+
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:677
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:664
+#: calendar/gui/e-itip-control.c:692
 #, c-format
 msgid "<b>Summary:</b> %s<br><br>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:664
+#: calendar/gui/e-itip-control.c:692
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:674
+#: calendar/gui/e-itip-control.c:702
 #, fuzzy, c-format
 msgid "<b>Description:</b> %s"
 msgstr "��������:"
 
-#: calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:737
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:738
 #, fuzzy
 msgid "Meeting Information"
 msgstr "������������� ����������"
 
-#: calendar/gui/e-itip-control.c:715
+#: calendar/gui/e-itip-control.c:742
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:716
+#: calendar/gui/e-itip-control.c:743
 msgid "Meeting Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-itip-control.c:747
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:721
+#: calendar/gui/e-itip-control.c:748
 #, fuzzy
 msgid "Meeting Update"
 msgstr "���� �� �������:"
 
-#: calendar/gui/e-itip-control.c:725
+#: calendar/gui/e-itip-control.c:752
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:726
+#: calendar/gui/e-itip-control.c:753
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:730
+#: calendar/gui/e-itip-control.c:757
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:731
+#: calendar/gui/e-itip-control.c:758
 msgid "Meeting Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:735
+#: calendar/gui/e-itip-control.c:762
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:736
+#: calendar/gui/e-itip-control.c:763
 msgid "Meeting Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:740 calendar/gui/e-itip-control.c:788
-#: calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:767 calendar/gui/e-itip-control.c:815
+#: calendar/gui/e-itip-control.c:848
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:741
+#: calendar/gui/e-itip-control.c:768
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "��������� �� �����������"
 
-#: calendar/gui/e-itip-control.c:758
+#: calendar/gui/e-itip-control.c:785
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:759
+#: calendar/gui/e-itip-control.c:786
 #, fuzzy
 msgid "Task Information"
 msgstr "����������"
 
-#: calendar/gui/e-itip-control.c:763
+#: calendar/gui/e-itip-control.c:790
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:791
 #, fuzzy
 msgid "Task Proposal"
 msgstr "������"
 
-#: calendar/gui/e-itip-control.c:768
+#: calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:769
+#: calendar/gui/e-itip-control.c:796
 #, fuzzy
 msgid "Task Update"
 msgstr "���� ����"
 
-#: calendar/gui/e-itip-control.c:773
+#: calendar/gui/e-itip-control.c:800
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:774
+#: calendar/gui/e-itip-control.c:801
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:778
+#: calendar/gui/e-itip-control.c:805
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:806
 #, fuzzy
 msgid "Task Reply"
 msgstr "��������"
 
-#: calendar/gui/e-itip-control.c:783
+#: calendar/gui/e-itip-control.c:810
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:784
+#: calendar/gui/e-itip-control.c:811
 msgid "Task Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:816
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "���������� �����������"
 
-#: calendar/gui/e-itip-control.c:806
+#: calendar/gui/e-itip-control.c:833
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:807
+#: calendar/gui/e-itip-control.c:834
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "������������� ����������"
 
-#: calendar/gui/e-itip-control.c:811
+#: calendar/gui/e-itip-control.c:838
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:812
+#: calendar/gui/e-itip-control.c:839
 #, fuzzy
 msgid "Free/Busy Request"
 msgstr "Free-busy �����"
 
-#: calendar/gui/e-itip-control.c:816
+#: calendar/gui/e-itip-control.c:843
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:817
+#: calendar/gui/e-itip-control.c:844
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "Free-busy �����"
 
-#: calendar/gui/e-itip-control.c:822
+#: calendar/gui/e-itip-control.c:849
 msgid "Bad Free/Busy Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:889
+#: calendar/gui/e-itip-control.c:916
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "������� �������� �� � ������������� ���������."
 
-#: calendar/gui/e-itip-control.c:908
+#: calendar/gui/e-itip-control.c:935
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:936 calendar/gui/e-itip-control.c:942
+#: calendar/gui/e-itip-control.c:963 calendar/gui/e-itip-control.c:969
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1088
 #, fuzzy
 msgid "Calendar file could not be updated!\n"
 msgstr "Cursor �� ���� �� ���� �������\n"
 
-#: calendar/gui/e-itip-control.c:1063
+#: calendar/gui/e-itip-control.c:1090
 #, fuzzy
 msgid "Update complete\n"
 msgstr "�������� ����������"
 
-#: calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.c:1134
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1142
 msgid "Attendee status ould not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1144
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1119
+#: calendar/gui/e-itip-control.c:1146
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1174
 #, fuzzy
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "�� ���� �� ������� ������ ���������� ����!\n"
 
-#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-itip-control.c:1176
 #, fuzzy
 msgid "Removal Complete"
 msgstr "% ����������:"
 
-#: calendar/gui/e-itip-control.c:1181 calendar/gui/e-itip-control.c:1216
+#: calendar/gui/e-itip-control.c:1208 calendar/gui/e-itip-control.c:1242
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "��������� �� ����"
 
-#: calendar/gui/e-itip-control.c:1183 calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1210 calendar/gui/e-itip-control.c:1246
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1380
+#: calendar/gui/e-itip-control.c:1406
 msgid "Unable to find any of your identities in the attendees list!\n"
 msgstr ""
 
@@ -4911,6 +4952,14 @@ msgstr "�������� �� ������:"
 msgid "Room"
 msgstr ""
 
+#: calendar/gui/e-meeting-model.c:226 calendar/gui/e-meeting-model.c:261
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:674
+#: calendar/gui/e-meeting-model.c:690
+#: camel/providers/smtp/camel-smtp-transport.c:224
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
+msgid "Unknown"
+msgstr "����������"
+
 #: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
 #: calendar/gui/e-meeting-model.c:686
 msgid "Chair"
@@ -4968,14 +5017,14 @@ msgstr "� �������"
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:472
-#: calendar/gui/e-meeting-time-sel.c:1936
+#: calendar/gui/e-meeting-time-sel.c:1937
 msgid "%A, %B %d, %Y"
 msgstr ""
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:476
-#: calendar/gui/e-meeting-time-sel.c:1964 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:1965 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:345
 msgid "%a %m/%d/%Y"
 msgstr ""
@@ -4983,7 +5032,7 @@ msgstr ""
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:480 e-util/e-time-utils.c:221
-#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1552
+#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1577
 msgid "%m/%d/%Y"
 msgstr ""
 
@@ -5061,17 +5110,17 @@ msgstr ""
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3268 calendar/gui/e-week-view.c:3306
+#: calendar/gui/e-week-view.c:3276 calendar/gui/e-week-view.c:3314
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "���� �����"
 
-#: calendar/gui/gnome-cal.c:1318
+#: calendar/gui/gnome-cal.c:1319
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "�� ���� �� ������ ����� � `%s'"
 
-#: calendar/gui/gnome-cal.c:1329
+#: calendar/gui/gnome-cal.c:1330
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
@@ -5141,205 +5190,205 @@ msgstr ""
 msgid "Could not create the component editor factory"
 msgstr "�� ���� �� ������ �������� ����������: %s"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "1st"
 msgstr "1��"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "2nd"
 msgstr "2��"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "3rd"
 msgstr "3��"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "4th"
 msgstr "4��"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "5th"
 msgstr "5��"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "6th"
 msgstr "6��"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "7th"
 msgstr "7��"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "8th"
 msgstr "8��"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "9th"
 msgstr "9��"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "10th"
 msgstr "10��"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "11th"
 msgstr "11��"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "12th"
 msgstr "12��"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "13th"
 msgstr "13��"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "14th"
 msgstr "14��"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "15th"
 msgstr "15��"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "16th"
 msgstr "16��"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "17th"
 msgstr "17��"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "18th"
 msgstr "18��"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "19th"
 msgstr "19��"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "20th"
 msgstr "20��"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "21st"
 msgstr "21��"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "22nd"
 msgstr "22��"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "23rd"
 msgstr "23��"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "24th"
 msgstr "24��"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "25th"
 msgstr "25��"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "26th"
 msgstr "26��"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "27th"
 msgstr "27��"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "28th"
 msgstr "28��"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "29th"
 msgstr "29��"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "30th"
 msgstr "30��"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:432
 msgid "31st"
 msgstr "31��"
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "Su"
 msgstr "��"
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "Mo"
 msgstr "��"
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "Tu"
 msgstr "��"
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "We"
 msgstr "��"
 
-#: calendar/gui/print.c:497
+#: calendar/gui/print.c:500
 msgid "Th"
 msgstr "��"
 
-#: calendar/gui/print.c:497
+#: calendar/gui/print.c:500
 msgid "Fr"
 msgstr "��"
 
-#: calendar/gui/print.c:497
+#: calendar/gui/print.c:500
 msgid "Sa"
 msgstr "��"
 
 #. Day
-#: calendar/gui/print.c:1827
+#: calendar/gui/print.c:1831
 #, fuzzy
 msgid "Selected day (%a %b %d %Y)"
 msgstr "����� ��� (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1846 calendar/gui/print.c:1850
+#: calendar/gui/print.c:1850 calendar/gui/print.c:1854
 msgid "%a %b %d"
 msgstr ""
 
-#: calendar/gui/print.c:1847
+#: calendar/gui/print.c:1851
 msgid "%a %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1858
+#: calendar/gui/print.c:1862
 #, fuzzy, c-format
 msgid "Selected week (%s - %s)"
 msgstr "������ ������� (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1866
+#: calendar/gui/print.c:1870
 #, fuzzy
 msgid "Selected month (%b %Y)"
 msgstr "����� ����� (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1873
+#: calendar/gui/print.c:1877
 #, fuzzy
 msgid "Selected year (%Y)"
 msgstr "������ ������ (%Y)"
 
-#: calendar/gui/print.c:2214
+#: calendar/gui/print.c:2221
 msgid "Print Calendar"
 msgstr "��������� ��������"
 
-#: calendar/gui/print.c:2302 calendar/gui/print.c:2394
-#: mail/mail-callbacks.c:2071 my-evolution/e-summary.c:551
+#: calendar/gui/print.c:2312 calendar/gui/print.c:2404
+#: mail/mail-callbacks.c:2080 my-evolution/e-summary.c:607
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
 msgstr "������� �������"
 
-#: calendar/gui/print.c:2331
+#: calendar/gui/print.c:2341
 #, fuzzy
 msgid "Print Item"
 msgstr "������� ���������..."
 
-#: calendar/gui/print.c:2412
+#: calendar/gui/print.c:2422
 msgid "Print Setup"
 msgstr "������� ���������..."
 
@@ -5524,72 +5573,87 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr ""
 
-#: camel/camel-disco-store.c:305
+#: camel/camel-disco-store.c:336
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
+#: camel/camel-filter-driver.c:549 camel/camel-filter-driver.c:558
 #, fuzzy
 msgid "Syncing folders"
 msgstr "�������������� �� �����"
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:659
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "�� ���� �� ������ ��������� �����"
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:668
 #, fuzzy
 msgid "Unable to process spool folder"
 msgstr ""
 "�� ���� �� ����������� ������� '%s':\n"
 "%s"
 
-#: camel/camel-filter-driver.c:667
+#: camel/camel-filter-driver.c:683
 #, fuzzy, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "���������� �� ��������� ����� %d �� %d (uid \"%s\")"
 
-#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
+#: camel/camel-filter-driver.c:687 camel/camel-filter-driver.c:700
 #, fuzzy, c-format
 msgid "Failed on message %d"
 msgstr "_Mail ���������"
 
-#: camel/camel-filter-driver.c:672
+#: camel/camel-filter-driver.c:688
 #, fuzzy
 msgid "Cannot open message"
 msgstr "�������� �� �����������"
 
-#: camel/camel-filter-driver.c:698 camel/camel-filter-driver.c:814
+#: camel/camel-filter-driver.c:714 camel/camel-filter-driver.c:829
 #, fuzzy
 msgid "Syncing folder"
 msgstr "�������������� �� �����"
 
-#: camel/camel-filter-driver.c:770
+#: camel/camel-filter-driver.c:786
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "���������� �� ��������� ����� %d �� %d (uid \"%s\")"
 
-#: camel/camel-filter-driver.c:775 camel/camel-filter-driver.c:793
+#: camel/camel-filter-driver.c:791 camel/camel-filter-driver.c:809
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "���������� ��������� - %s"
 
-#: camel/camel-filter-driver.c:900
+#: camel/camel-filter-driver.c:918
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:906
+#: camel/camel-filter-driver.c:924
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-search.c:479 camel/camel-filter-search.c:486
+#: camel/camel-filter-search.c:494 camel/camel-filter-search.c:501
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
 
+#: camel/camel-folder.c:472
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1039
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1219
+#, fuzzy
+msgid "Moving messages"
+msgstr "�������� ��������(���/���) �"
+
 #: camel/camel-folder-search.c:333
 #, c-format
 msgid ""
@@ -5613,7 +5677,7 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:747 camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:748 camel/camel-folder-search.c:792
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
@@ -5712,73 +5776,73 @@ msgstr ""
 msgid "Error copying mail temp file: %s"
 msgstr "������ ��� ����������� �� ����: %s"
 
-#: camel/camel-pgp-context.c:193
+#: camel/camel-pgp-context.c:191
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:196
+#: camel/camel-pgp-context.c:194
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr ""
 
-#: camel/camel-pgp-context.c:518
+#: camel/camel-pgp-context.c:525
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr ""
 
-#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:532 camel/camel-pgp-context.c:706
 msgid "Cannot sign this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:538 camel/camel-pgp-context.c:712
 #, c-format
 msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:693
+#: camel/camel-pgp-context.c:699
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr ""
 
-#: camel/camel-pgp-context.c:886
+#: camel/camel-pgp-context.c:891
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr ""
 
-#: camel/camel-pgp-context.c:892
+#: camel/camel-pgp-context.c:897
 #, c-format
 msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:903
+#: camel/camel-pgp-context.c:908
 #, fuzzy, c-format
 msgid "Cannot verify this message: couldn't create temp file: %s"
 msgstr "�� ���� �� ������ �������� ����: %s"
 
-#: camel/camel-pgp-context.c:1069
+#: camel/camel-pgp-context.c:1076
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1079
+#: camel/camel-pgp-context.c:1086
 msgid "Cannot encrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1086
+#: camel/camel-pgp-context.c:1093
 #, c-format
 msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1095
+#: camel/camel-pgp-context.c:1102
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1258
+#: camel/camel-pgp-context.c:1264
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1266
+#: camel/camel-pgp-context.c:1272
 msgid "Cannot decrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1273
+#: camel/camel-pgp-context.c:1279
 #, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
@@ -5822,13 +5886,13 @@ msgstr "�� ���� �� �� ������ ���  %s (���� %d): %s"
 msgid "(unknown host)"
 msgstr "(���������� ����)"
 
-#: camel/camel-remote-store.c:361 camel/camel-remote-store.c:423
-#: camel/camel-remote-store.c:486
+#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
+#: camel/camel-remote-store.c:483
 #: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "���������� ����������"
 
-#: camel/camel-remote-store.c:489
+#: camel/camel-remote-store.c:486
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -5929,7 +5993,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:492
+#: camel/providers/imap/camel-imap-store.c:494
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -5948,7 +6012,7 @@ msgstr "���������� ��� �� �������������"
 
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:302
-#: camel/providers/pop3/camel-pop3-provider.c:68 mail/mail-config.glade.h:54
+#: camel/providers/pop3/camel-pop3-provider.c:68 mail/mail-config.glade.h:55
 msgid "Password"
 msgstr "������"
 
@@ -5977,37 +6041,37 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:154
+#: camel/camel-service.c:157
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:162
+#: camel/camel-service.c:165
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:170
+#: camel/camel-service.c:173
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:548
+#: camel/camel-service.c:602
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:575
+#: camel/camel-service.c:629
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:600
+#: camel/camel-service.c:654
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:602
+#: camel/camel-service.c:656
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
@@ -6020,12 +6084,12 @@ msgstr ""
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:322 camel/camel-session.c:391
+#: camel/camel-session.c:324 camel/camel-session.c:393
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:508
+#: camel/camel-session.c:510
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -6077,7 +6141,7 @@ msgstr ""
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "�� ���� �� ����������� ������� %s �� %s: %s"
 
-#: camel/camel-tcp-stream-openssl.c:463
+#: camel/camel-tcp-stream-openssl.c:491
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -6085,7 +6149,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:369
+#: camel/camel-tcp-stream-openssl.c:496 camel/camel-tcp-stream-ssl.c:369
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -6114,17 +6178,41 @@ msgstr ""
 "�� ���� �� ������ ���� `%s':\n"
 "%s"
 
-#: camel/camel-vee-folder.c:546
+#: camel/camel-vee-folder.c:554
 #, fuzzy, c-format
 msgid "No such message %s in %s"
 msgstr "���� ������ ���������: %s"
 
-#: camel/camel-vee-folder.c:641
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message: %s"
 msgstr "���� ������ ���������: %s"
 
-#: camel/camel-vtrash-folder.c:106
+#: camel/camel-vee-store.c:250
+#, fuzzy, c-format
+msgid "Cannot delete folder: %s: Invalid operation"
+msgstr "�� ���� �� ����������� ������� %s �� %s: %s"
+
+#: camel/camel-vee-store.c:286
+#, fuzzy, c-format
+msgid "Cannot delete folder: %s: No such folder"
+msgstr ""
+"�� ���� �� ������ ������� `%s':\n"
+"%s"
+
+#: camel/camel-vee-store.c:298
+#, fuzzy, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "�� ���� �� ����������� ������� %s �� %s: %s"
+
+#: camel/camel-vee-store.c:326
+#, fuzzy, c-format
+msgid "Cannot rename folder: %s: No such folder"
+msgstr ""
+"�� ���� �� ������ ������� `%s':\n"
+"%s"
+
+#: camel/camel-vtrash-folder.c:109
 #, fuzzy
 msgid "You cannot copy messages from this trash folder."
 msgstr ""
@@ -6176,7 +6264,7 @@ msgid "Scanning for changed messages"
 msgstr "����������� �� �����������"
 
 #: camel/providers/imap/camel-imap-folder.c:1491
-#: camel/providers/imap/camel-imap-folder.c:1890
+#: camel/providers/imap/camel-imap-folder.c:1899
 #, fuzzy
 msgid "This message is not currently available"
 msgstr ""
@@ -6193,7 +6281,7 @@ msgstr ""
 msgid "Scanning for new messages"
 msgstr "����������� �� �����������"
 
-#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/imap/camel-imap-folder.c:1936
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -6210,7 +6298,7 @@ msgstr "�� ���� �� ������ ���������� %s: %s"
 msgid "Failed to cache message %s: %s"
 msgstr "���� ������ ���������: %s"
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:14
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Checking for new mail"
 msgstr "������ ��� email"
@@ -6220,7 +6308,7 @@ msgstr "������ ��� email"
 msgid "Check for new messages in all folders"
 msgstr "������� ����������� � ���� �����"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:733
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:767
 msgid "Folders"
 msgstr "�����"
 
@@ -6253,28 +6341,28 @@ msgstr ""
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:515
+#: camel/providers/imap/camel-imap-store.c:517
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:525
+#: camel/providers/imap/camel-imap-store.c:527
 #: camel/providers/smtp/camel-smtp-transport.c:388
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap/camel-imap-store.c:551
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s���� �������� IMAP �������� �� %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:566
 #: camel/providers/smtp/camel-smtp-transport.c:432
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:590
+#: camel/providers/imap/camel-imap-store.c:592
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6282,12 +6370,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:889
+#: camel/providers/imap/camel-imap-store.c:891
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "���� ������ ����� `%s'."
 
-#: camel/providers/imap/camel-imap-store.c:1090
+#: camel/providers/imap/camel-imap-store.c:1131
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -6322,53 +6410,53 @@ msgstr "Qmail maildir-������ mail �������"
 msgid "For storing local mail in qmail maildir directories."
 msgstr "�� ���������� �� ������� ���� � qmail maildir ����������"
 
-#: camel/providers/local/camel-local-provider.c:77
+#: camel/providers/local/camel-local-provider.c:78
 #, fuzzy
 msgid "Standard Unix mbox spools"
 msgstr "���������� Unix mailbox ����"
 
-#: camel/providers/local/camel-local-provider.c:78
+#: camel/providers/local/camel-local-provider.c:79
 #, fuzzy
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr "�� ���������� �� ������� ���� � ���������� mbox ������"
 
-#: camel/providers/local/camel-local-store.c:127
-#: camel/providers/local/camel-spool-store.c:112
+#: camel/providers/local/camel-local-store.c:132
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:134
+#: camel/providers/local/camel-local-store.c:139
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:142
-#: camel/providers/local/camel-local-store.c:158
+#: camel/providers/local/camel-local-store.c:147
+#: camel/providers/local/camel-local-store.c:163
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:173
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:183
+#: camel/providers/local/camel-local-store.c:190
 #, c-format
 msgid "Local mail file %s"
 msgstr "������� mail ���� %s"
 
-#: camel/providers/local/camel-local-store.c:240
+#: camel/providers/local/camel-local-store.c:247
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "�� ���� �� ����������� ������� %s �� %s: %s"
 
-#: camel/providers/local/camel-local-store.c:282
+#: camel/providers/local/camel-local-store.c:289
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:292
+#: camel/providers/local/camel-local-store.c:299
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
@@ -6654,26 +6742,26 @@ msgstr "�� ���� �� ������ mailbox: %s: %s\n"
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "�� ���� �� ������ ����������� � mbox �����: %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:133
+#: camel/providers/local/camel-spool-store.c:116
 #, fuzzy, c-format
 msgid "Spool `%s' does not exist or is not a regular file"
 msgstr "`%s' �� � ��������� ����."
 
-#: camel/providers/local/camel-spool-store.c:159
+#: camel/providers/local/camel-spool-store.c:142
 #, fuzzy, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "������� `%s' �� ����������."
 
-#: camel/providers/local/camel-spool-store.c:181
+#: camel/providers/local/camel-spool-store.c:164
 #, fuzzy, c-format
 msgid "Spool mail file %s"
 msgstr "������� mail ���� %s"
 
-#: camel/providers/local/camel-spool-store.c:227
+#: camel/providers/local/camel-spool-store.c:210
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:235
+#: camel/providers/local/camel-spool-store.c:218
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
@@ -6796,31 +6884,31 @@ msgstr ""
 msgid "Could not check POP server for new messages: %s"
 msgstr "����������� �� ���� �� ���� ���������: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:235
+#: camel/providers/pop3/camel-pop3-folder.c:242
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:259
+#: camel/providers/pop3/camel-pop3-folder.c:266
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "����� ��������� ���������"
 
-#: camel/providers/pop3/camel-pop3-folder.c:335
+#: camel/providers/pop3/camel-pop3-folder.c:342
 #, fuzzy, c-format
 msgid "Could not fetch message: %s"
 msgstr "����������� �� ���� �� ���� ���������: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:351
+#: camel/providers/pop3/camel-pop3-folder.c:358
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:374
+#: camel/providers/pop3/camel-pop3-folder.c:381
 #, c-format
 msgid "No message with uid %s"
 msgstr "���� ��������� � uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:378
+#: camel/providers/pop3/camel-pop3-folder.c:385
 #, fuzzy, c-format
 msgid "Retrieving POP message %d"
 msgstr "������������� ���������"
@@ -6840,7 +6928,7 @@ msgstr "���� ������ �� �������"
 msgid "Delete after %s day(s)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:53
+#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:54
 msgid "POP"
 msgstr ""
 
@@ -6922,7 +7010,7 @@ msgid "Unexpected response from POP server: %s"
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:73
 msgid "Sendmail"
 msgstr ""
 
@@ -6975,7 +7063,7 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:66
 msgid "SMTP"
 msgstr ""
 
@@ -7582,13 +7670,13 @@ msgstr ""
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:309 e-util/e-time-utils.c:396
-#: widgets/misc/e-dateedit.c:1360 widgets/misc/e-dateedit.c:1587
+#: widgets/misc/e-dateedit.c:1385 widgets/misc/e-dateedit.c:1612
 msgid "%I:%M %p"
 msgstr ""
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:313 e-util/e-time-utils.c:388
-#: widgets/misc/e-dateedit.c:1357 widgets/misc/e-dateedit.c:1584
+#: widgets/misc/e-dateedit.c:1382 widgets/misc/e-dateedit.c:1609
 msgid "%H:%M"
 msgstr ""
 
@@ -7727,8 +7815,8 @@ msgid ""
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:232 filter/vfolder-rule.c:351
-#: mail/mail-account-gui.c:820
+#: filter/filter-folder.c:232 filter/vfolder-rule.c:356
+#: mail/mail-account-gui.c:822
 msgid "Select Folder"
 msgstr "������ �����"
 
@@ -7985,7 +8073,7 @@ msgstr ""
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1242
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1251
 msgid "Sender"
 msgstr "��������:"
 
@@ -8018,7 +8106,7 @@ msgstr "������� �"
 msgid "Stop Processing"
 msgstr "�������� �����������"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:893
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:917
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "����"
@@ -8049,7 +8137,7 @@ msgstr "������ �������"
 msgid "Score Rules"
 msgstr ""
 
-#: filter/vfolder-rule.c:203
+#: filter/vfolder-rule.c:206
 msgid "Oops.  You need to to specify at least one folder as a source."
 msgstr ""
 
@@ -8069,19 +8157,19 @@ msgstr "������ ����..."
 msgid "Please wait"
 msgstr "�������� �"
 
-#: importers/elm-importer.c:171 importers/netscape-importer.c:701
+#: importers/elm-importer.c:171 importers/netscape-importer.c:708
 #: importers/pine-importer.c:369
 #, c-format
 msgid "Importing %s as %s"
 msgstr ""
 
-#: importers/elm-importer.c:377 importers/netscape-importer.c:794
+#: importers/elm-importer.c:377 importers/netscape-importer.c:801
 #: importers/pine-importer.c:506
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "��������� �� \"%s\""
 
-#: importers/elm-importer.c:528 importers/netscape-importer.c:967
+#: importers/elm-importer.c:528 importers/netscape-importer.c:974
 #: importers/pine-importer.c:669 mail/component-factory.c:96
 msgid "Mail"
 msgstr ""
@@ -8115,20 +8203,20 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: importers/netscape-importer.c:897 importers/pine-importer.c:602
+#: importers/netscape-importer.c:904 importers/pine-importer.c:602
 msgid "Scanning directory"
 msgstr ""
 
-#: importers/netscape-importer.c:906
+#: importers/netscape-importer.c:913
 msgid "Starting import"
 msgstr ""
 
-#: importers/netscape-importer.c:972
+#: importers/netscape-importer.c:979
 #, fuzzy
 msgid "Settings"
 msgstr "���������"
 
-#: importers/netscape-importer.c:993
+#: importers/netscape-importer.c:1000
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8215,21 +8303,27 @@ msgstr "��������..."
 msgid "Change this folder's properties"
 msgstr ""
 
-#: mail/component-factory.c:790
+#: mail/component-factory.c:698
+msgid ""
+"Some of your mail settings seem corrupt, please check that everything is in "
+"order."
+msgstr ""
+
+#: mail/component-factory.c:812
 #, fuzzy
 msgid "New Mail Message"
 msgstr "_Mail ���������"
 
-#: mail/component-factory.c:790
+#: mail/component-factory.c:812
 #, fuzzy
 msgid "New _Mail Message"
 msgstr "_Mail ���������"
 
-#: mail/component-factory.c:821
+#: mail/component-factory.c:843
 msgid "Cannot initialize Evolution's mail component."
 msgstr "�� ���� �� ������������� mail ����������� �� Evolution."
 
-#: mail/component-factory.c:1007
+#: mail/component-factory.c:1032
 msgid "Cannot register storage with shell"
 msgstr ""
 
@@ -8242,176 +8336,176 @@ msgstr "��������"
 msgid "Properties"
 msgstr "��������"
 
-#: mail/folder-browser.c:239 mail/mail-display.c:275
+#: mail/folder-browser.c:262 mail/mail-display.c:275
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "�� ���� �� ������ �������� ����������: %s"
 
-#: mail/folder-browser.c:708
+#: mail/folder-browser.c:734
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/folder-browser.c:711 mail/folder-browser.c:716
-#: mail/folder-browser.c:720
+#: mail/folder-browser.c:737 mail/folder-browser.c:742
+#: mail/folder-browser.c:746
 msgid ", "
 msgstr ""
 
-#: mail/folder-browser.c:712
+#: mail/folder-browser.c:738
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/folder-browser.c:717
+#: mail/folder-browser.c:743
 #, fuzzy, c-format
 msgid "%d selected"
 msgstr " %d �������"
 
-#: mail/folder-browser.c:722
+#: mail/folder-browser.c:748
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr " %d �������"
 
-#: mail/folder-browser.c:724
+#: mail/folder-browser.c:750
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/folder-browser.c:958
+#: mail/folder-browser.c:993
 #, fuzzy
 msgid "Create vFolder from Search"
 msgstr "������ ������� �� �����������"
 
-#: mail/folder-browser.c:1303
+#: mail/folder-browser.c:1338
 #, fuzzy
 msgid "VFolder on _Subject"
 msgstr "VFolder ����� ����"
 
-#: mail/folder-browser.c:1306
+#: mail/folder-browser.c:1341
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:1309
+#: mail/folder-browser.c:1344
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:1312
+#: mail/folder-browser.c:1347
 #, fuzzy
 msgid "VFolder on Mailing _List"
 msgstr "������ ����� Mailing List"
 
-#: mail/folder-browser.c:1318
+#: mail/folder-browser.c:1353
 #, fuzzy
 msgid "Filter on Sub_ject"
 msgstr "������ ����� ����"
 
-#: mail/folder-browser.c:1321
+#: mail/folder-browser.c:1356
 #, fuzzy
 msgid "Filter on Sen_der"
 msgstr "������ ����� ��������"
 
-#: mail/folder-browser.c:1324
+#: mail/folder-browser.c:1359
 #, fuzzy
 msgid "Filter on Re_cipients"
 msgstr "������ ����� ����������"
 
-#: mail/folder-browser.c:1327
+#: mail/folder-browser.c:1362
 #, fuzzy
 msgid "Filter on _Mailing List"
 msgstr "������ ����� Mailing List"
 
-#: mail/folder-browser.c:1338 ui/evolution-mail-message.xml.h:89
+#: mail/folder-browser.c:1373 ui/evolution-mail-message.xml.h:89
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "���������� �����������"
 
-#: mail/folder-browser.c:1340 ui/evolution-mail-message.xml.h:97
+#: mail/folder-browser.c:1375 ui/evolution-mail-message.xml.h:97
 msgid "_Save As..."
 msgstr "_������� ����..."
 
-#: mail/folder-browser.c:1342
+#: mail/folder-browser.c:1377
 msgid "_Print"
 msgstr "�����"
 
-#: mail/folder-browser.c:1347 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1382 ui/evolution-mail-message.xml.h:96
 #, fuzzy
 msgid "_Reply to Sender"
 msgstr "�������� �� ���������"
 
-#: mail/folder-browser.c:1349 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1384 ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Reply to _List"
 msgstr "�������� �� ������"
 
-#: mail/folder-browser.c:1351 ui/evolution-mail-message.xml.h:68
+#: mail/folder-browser.c:1386 ui/evolution-mail-message.xml.h:68
 msgid "Reply to _All"
 msgstr "�������� �� ������"
 
-#: mail/folder-browser.c:1353
+#: mail/folder-browser.c:1388
 msgid "_Forward"
 msgstr "��������"
 
-#: mail/folder-browser.c:1356 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1391 ui/evolution-mail-message.xml.h:40
 #, fuzzy
 msgid "Mar_k as Read"
 msgstr "�������� ���� ���������"
 
-#: mail/folder-browser.c:1358 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1393 ui/evolution-mail-message.xml.h:42
 #, fuzzy
 msgid "Mark as U_nread"
 msgstr "�������� ���� �����������"
 
-#: mail/folder-browser.c:1360
+#: mail/folder-browser.c:1395
 #, fuzzy
 msgid "Mark as _Important"
 msgstr "�����"
 
-#: mail/folder-browser.c:1362
+#: mail/folder-browser.c:1397
 #, fuzzy
 msgid "Mark as Unim_portant"
 msgstr "�������� ���� �����������"
 
-#: mail/folder-browser.c:1367
+#: mail/folder-browser.c:1402
 msgid "_Move to Folder..."
 msgstr "�������� � �����..."
 
-#: mail/folder-browser.c:1369
+#: mail/folder-browser.c:1404
 msgid "_Copy to Folder..."
 msgstr "������� � �����..."
 
-#: mail/folder-browser.c:1373 ui/evolution-mail-message.xml.h:99
+#: mail/folder-browser.c:1408 ui/evolution-mail-message.xml.h:99
 msgid "_Undelete"
 msgstr "���������� �������"
 
-#: mail/folder-browser.c:1378
+#: mail/folder-browser.c:1413
 #, fuzzy
 msgid "Add Sender to Address Book"
 msgstr "������ ������� �����"
 
-#: mail/folder-browser.c:1383
+#: mail/folder-browser.c:1418
 msgid "Apply Filters"
 msgstr "��������� ������"
 
-#: mail/folder-browser.c:1387
+#: mail/folder-browser.c:1422
 #, fuzzy
 msgid "Create Ru_le From Message"
 msgstr "������ ������� �� �����������"
 
-#: mail/folder-browser.c:1538
+#: mail/folder-browser.c:1573
 msgid "Filter on Mailing List"
 msgstr "������ ����� Mailing List"
 
-#: mail/folder-browser.c:1539
+#: mail/folder-browser.c:1574
 #, fuzzy
 msgid "VFolder on Mailing List"
 msgstr "������ ����� Mailing List"
 
-#: mail/folder-browser.c:1541
+#: mail/folder-browser.c:1576
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "������ �� Mailing ���� (%s)"
 
-#: mail/folder-browser.c:1542
+#: mail/folder-browser.c:1577
 #, fuzzy, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "������ �� Mailing ���� (%s)"
@@ -8483,26 +8577,26 @@ msgstr "Evolution - ������ ���� �����"
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:945
+#: mail/mail-account-gui.c:947
 #, fuzzy
 msgid "Could not save signature file."
 msgstr ""
 "�� ���� �� ������ ���� `%s':\n"
 "%s"
 
-#: mail/mail-account-gui.c:1022
+#: mail/mail-account-gui.c:1024
 #, fuzzy
 msgid "Save signature"
 msgstr "������:"
 
-#: mail/mail-account-gui.c:1028
+#: mail/mail-account-gui.c:1030
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: mail/mail-account-gui.c:1611
+#: mail/mail-account-gui.c:1615
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -8537,7 +8631,7 @@ msgid "Are you sure you want to delete this news account?"
 msgstr ""
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:757 mail/mail-config.glade.h:42
+#: mail/mail-accounts.c:760 mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Mail Settings"
 msgstr "���������"
@@ -8635,37 +8729,37 @@ msgstr ""
 msgid "This message contains invalid recipients:"
 msgstr ""
 
-#: mail/mail-callbacks.c:453
+#: mail/mail-callbacks.c:454
 msgid "You must specify recipients in order to send this message."
 msgstr "������ �� ������� ���������(�) �� �� ���� �� ��������� �����������."
 
-#: mail/mail-callbacks.c:549
+#: mail/mail-callbacks.c:550
 msgid "You must configure an account before you can send this email."
 msgstr "������ �� ������������� ������ account �� �� ���� �� ��������� ����."
 
-#: mail/mail-callbacks.c:779
+#: mail/mail-callbacks.c:783
 #, fuzzy
 msgid "an unknown sender"
 msgstr "���������� ������"
 
-#: mail/mail-callbacks.c:784
+#: mail/mail-callbacks.c:788
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1162
+#: mail/mail-callbacks.c:1171
 msgid "Move message(s) to"
 msgstr "�������� ��������(���/���) �"
 
-#: mail/mail-callbacks.c:1164
+#: mail/mail-callbacks.c:1173
 msgid "Copy message(s) to"
 msgstr "������� ��������(���/���) �"
 
-#: mail/mail-callbacks.c:1538
+#: mail/mail-callbacks.c:1547
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1560
+#: mail/mail-callbacks.c:1569
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -8673,7 +8767,7 @@ msgstr ""
 "������ �� ����������� ���� ��������� ��������\n"
 "� ������� Drafts."
 
-#: mail/mail-callbacks.c:1594
+#: mail/mail-callbacks.c:1603
 #, fuzzy
 msgid ""
 "You may only resend messages\n"
@@ -8682,29 +8776,29 @@ msgstr ""
 "������ �� ����������� ���� ��������� ��������\n"
 "� ������� Drafts."
 
-#: mail/mail-callbacks.c:1606
+#: mail/mail-callbacks.c:1615
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1627
+#: mail/mail-callbacks.c:1636
 #, fuzzy
 msgid "No Message Selected"
 msgstr "����������� ���� ��������"
 
-#: mail/mail-callbacks.c:1712
+#: mail/mail-callbacks.c:1721
 msgid "Save Message As..."
 msgstr "������� ����������� ����..."
 
-#: mail/mail-callbacks.c:1714
+#: mail/mail-callbacks.c:1723
 msgid "Save Messages As..."
 msgstr "������� ����������� ����..."
 
-#: mail/mail-callbacks.c:1859 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:1868 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "��������"
 
-#: mail/mail-callbacks.c:1864
+#: mail/mail-callbacks.c:1873
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8712,12 +8806,12 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1871
+#: mail/mail-callbacks.c:1880
 #, fuzzy
 msgid "Do not ask me again."
 msgstr "�� �������� ���� ��������� ������."
 
-#: mail/mail-callbacks.c:1976
+#: mail/mail-callbacks.c:1985
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -8726,20 +8820,20 @@ msgstr ""
 "������ ��� ��������� ������������ �� �������:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1986
+#: mail/mail-callbacks.c:1995
 #, fuzzy
 msgid "Filters"
 msgstr "���������� ������"
 
-#: mail/mail-callbacks.c:2032
+#: mail/mail-callbacks.c:2041
 msgid "Print Message"
 msgstr "��������� �����������"
 
-#: mail/mail-callbacks.c:2078
+#: mail/mail-callbacks.c:2087
 msgid "Printing of message failed"
 msgstr "������������� ���������"
 
-#: mail/mail-callbacks.c:2162
+#: mail/mail-callbacks.c:2171
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -8785,91 +8879,112 @@ msgstr ""
 msgid "Evolution Account Assistant"
 msgstr ""
 
-#: mail/mail-config.c:1486
-msgid "Evolution Shortcuts"
+#: mail/mail-config.c:315
+#, fuzzy, c-format
+msgid "Account %d"
+msgstr "�������"
+
+#: mail/mail-config.c:1618
+#, c-format
+msgid ""
+"Could not get inbox for new mail store:\n"
+"%s\n"
+"No shortcut will be created."
 msgstr ""
 
-#. right now, the URL always works basically as a matter of luck...
-#. * both IMAP and mbox spool stores have INBOX as their inbox folder
-#. * name. I don't think this will work with maildir. How can we figure out
-#. * what shortcut to insert?
+#. Create the shortcut. FIXME: This only works if the
+#. * full name matches the path.
 #.
-#: mail/mail-config.c:1618
+#: mail/mail-config.c:1629
 #, c-format
 msgid "%s: Inbox"
 msgstr ""
 
-#: mail/mail-config.c:1851
+#: mail/mail-config.c:1873
 #, fuzzy
 msgid "Checking Service"
 msgstr "��������� ��� �������"
 
-#: mail/mail-config.c:1922 mail/mail-config.c:1925
+#: mail/mail-config.c:1944 mail/mail-config.c:1947
 #, fuzzy
 msgid "Connecting to server..."
 msgstr "��������� ��� �������"
 
 #: mail/mail-config.glade.h:1
+msgid " _Check for supported types "
+msgstr ""
+
+#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid " color"
 msgstr "������ ����"
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr ""
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr "Account ����������"
 
-#: mail/mail-config.glade.h:5 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:6 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "Accounts"
 msgstr "�������"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:10
 msgid "Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:10 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:12
 msgid "Authentication"
 msgstr "�������������"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Authentication Type: "
 msgstr "�������������:"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:14
 msgid "Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:16
 #, fuzzy
 msgid "Composer"
 msgstr "�������"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:17
+#, fuzzy
+msgid "Configuration"
+msgstr "Mail ������������"
+
+#: mail/mail-config.glade.h:18
+#, fuzzy
+msgid "Confirm when Expunging a folder"
+msgstr "��������� �� �����"
+
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -8879,352 +8994,335 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "De_fault"
 msgstr "�� ������������"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:26
 msgid "Default Forward style is: "
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:27
 msgid "Default character encoding: "
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:29
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:30
 msgid "Display"
 msgstr "�������"
 
-#: mail/mail-config.glade.h:27 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:31 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:28 shell/e-local-storage.c:174
+#: mail/mail-config.glade.h:32 shell/e-local-storage.c:174
 #, fuzzy
 msgid "Drafts"
 msgstr "����"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "Drafts folder:"
 msgstr "��������� �� ���� �����"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:34
 #, fuzzy
 msgid "E_nable"
 msgstr "���� �������"
 
-#: mail/mail-config.glade.h:31
-#, fuzzy
-msgid "Each account must have a different name."
-msgstr "������� �������� ���� � �������� ���"
-
-#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:96
 #: widgets/misc/e-filter-bar.h:103
 #, fuzzy
 msgid "Edit..."
 msgstr "��������"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:36
 msgid "Enabled"
 msgstr ""
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:37
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:38
 #, fuzzy
 msgid "HTML signature file:"
 msgstr "���� � ������:"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:39
 msgid "IMAPv4 "
 msgstr ""
 
-#: mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:40 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:41
 msgid "In HTML mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Inline"
 msgstr "������"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Kerberos "
 msgstr "�������"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:44
 msgid "Mail Configuration"
 msgstr "Mail ������������"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Mailbox location"
 msgstr "������ �� ���������� �����"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:47
 msgid "Make this my _default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:45
-msgid "Message _preview should be displayed by default"
-msgstr ""
-
-#: mail/mail-config.glade.h:46
-msgid "Message list should display in a _threaded fashion by default"
-msgstr ""
-
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "NNTP Server:"
 msgstr "LDAP ������"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:49
 msgid "News"
 msgstr "������"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Optional Information"
 msgstr "���� ����������"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:53
 msgid "PGP Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 msgid "Pick a color"
 msgstr "������ ����"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 msgid "Prompt when sending messages with an _empty subject"
 msgstr ""
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Qmail maildir "
 msgstr "Qmail maildir-������ mail �������"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid "Quoted"
 msgstr "�������"
 
-#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "���������� �� ������"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:63
 #, fuzzy
 msgid "Receiving Mail"
 msgstr "���������� �� ������"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:64
 #, fuzzy
 msgid "Receiving Options"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:65
 #, fuzzy
 msgid "Required Information"
 msgstr "������������� ����������"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:67
 msgid "Secure MIME"
 msgstr ""
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:68
 #, fuzzy
 msgid "Security"
 msgstr "_���������"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Select Filter Log file..."
 msgstr "������ ����"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:70
 msgid "Select PGP binary"
 msgstr "������ PGP ��������"
 
-#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:71 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "��������� �� Email"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Sending Mail"
 msgstr "��������� �� Email"
 
-#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:74 mail/message-list.etspec.h:6
 #: shell/e-local-storage.c:177
 #, fuzzy
 msgid "Sent"
 msgstr "�������"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "������� ����������� ����"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Sent messages folder:"
 msgstr "������� ����������� ��-�����"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:77
 msgid "Server Configuration"
 msgstr "������ ������������"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 msgid "Server Type: "
 msgstr "��� ������:"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "Server requires _authentication"
 msgstr "�������� ������� authentication"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:80
 msgid "Signature file:"
 msgstr "���� � ������:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "Source"
 msgstr ""
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "Source Information"
 msgstr "���� ����������"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:83
 msgid "Sources"
 msgstr ""
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Special Folders"
 msgstr "��������� �����"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:85
 #, fuzzy
 msgid "Standard Unix mbox"
 msgstr "���������� Unix mailbox ����"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "Use secure connection (_SSL)"
 msgstr "���� ������ ������� ���������� ������ (SSL)"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:88
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:92
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:93
 msgid "_Automatically check for new mail every"
 msgstr ""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:94
 msgid "_Check for supported types"
 msgstr ""
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "_Email Address:"
 msgstr "Email �����:"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:98
 msgid "_Empty trash folders on exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 #, fuzzy
 msgid "_Full Name:"
 msgstr "����� ���:"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "_HTML Signature:"
 msgstr "������:"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 msgid "_Highlight citations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "_Host:"
 msgstr "������:"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 msgid "_Log filter actions to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 #, fuzzy
 msgid "_Mark messages as Read after"
 msgstr "�������� ����������� ���� \"���������\" ����:"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 #, fuzzy
 msgid "_Name:"
 msgstr "���:"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 #, fuzzy
 msgid "_Organization:"
 msgstr "�����������:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:109
 #, fuzzy
 msgid "_PGP binary path:"
 msgstr "PGP ����������"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "_Path:"
 msgstr "���:"
 
-#: mail/mail-config.glade.h:110
-msgid "_Remember PGP Passphrase until exit"
-msgstr ""
-
 #: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "_Remember this password"
@@ -9262,40 +9360,40 @@ msgstr ""
 msgid "seconds."
 msgstr "�������."
 
-#: mail/mail-crypto.c:60
+#: mail/mail-crypto.c:59
 msgid "Could not create a PGP signature context."
 msgstr ""
 
-#: mail/mail-crypto.c:86
+#: mail/mail-crypto.c:84
 msgid "Could not create a PGP verification context."
 msgstr ""
 
-#: mail/mail-crypto.c:116
+#: mail/mail-crypto.c:113
 msgid "Could not create a PGP encryption context."
 msgstr ""
 
-#: mail/mail-crypto.c:142
+#: mail/mail-crypto.c:138
 #, fuzzy
 msgid "Could not create a PGP decryption context."
 msgstr "�� ���� �� ������ ���������� %s: %s"
 
-#: mail/mail-crypto.c:177
+#: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
 msgstr ""
 
-#: mail/mail-crypto.c:209
+#: mail/mail-crypto.c:205
 msgid "Could not create a S/MIME certsonly context."
 msgstr ""
 
-#: mail/mail-crypto.c:240
+#: mail/mail-crypto.c:236
 msgid "Could not create a S/MIME encryption context."
 msgstr ""
 
-#: mail/mail-crypto.c:271
+#: mail/mail-crypto.c:267
 msgid "Could not create a S/MIME envelope context."
 msgstr ""
 
-#: mail/mail-crypto.c:301
+#: mail/mail-crypto.c:297
 msgid "Could not create a S/MIME decode context."
 msgstr ""
 
@@ -9345,11 +9443,11 @@ msgstr ""
 "\n"
 "���������� ���������������: "
 
-#: mail/mail-display.c:1519
+#: mail/mail-display.c:1520
 msgid "Save Link as (FIXME)"
 msgstr ""
 
-#: mail/mail-display.c:1521
+#: mail/mail-display.c:1523
 #, fuzzy
 msgid "Save Image as..."
 msgstr "������� ����..."
@@ -9367,129 +9465,129 @@ msgstr ""
 msgid "Date"
 msgstr "����"
 
-#: mail/mail-format.c:860
+#: mail/mail-format.c:862
 #, fuzzy
 msgid "Bad Address"
 msgstr "Email �����:"
 
-#: mail/mail-format.c:882 mail/message-list.etspec.h:3
+#: mail/mail-format.c:903 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "��"
 
-#: mail/mail-format.c:885
+#: mail/mail-format.c:906
 #, fuzzy
 msgid "Reply-To"
 msgstr "�������-��:"
 
-#: mail/mail-format.c:888 mail/message-list.etspec.h:10
+#: mail/mail-format.c:910 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "��"
 
-#: mail/mail-format.c:891
+#: mail/mail-format.c:914
 msgid "Cc"
 msgstr ""
 
-#: mail/mail-format.c:1311
+#: mail/mail-format.c:1357
 #, fuzzy
 msgid "No GPG/PGP program configured."
 msgstr "���� �������� GPG/PGP ��������."
 
-#: mail/mail-format.c:1327
+#: mail/mail-format.c:1373
 msgid "Encrypted message not displayed"
 msgstr "������������ ��������� �� � ��������"
 
-#: mail/mail-format.c:1338
+#: mail/mail-format.c:1384
 msgid "Encrypted message"
 msgstr "���������� ���������"
 
-#: mail/mail-format.c:1339
+#: mail/mail-format.c:1385
 msgid "Click icon to decrypt."
 msgstr "������� ����� ������� �� ������������."
 
-#: mail/mail-format.c:1394
+#: mail/mail-format.c:1440
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1405
+#: mail/mail-format.c:1451
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2083
+#: mail/mail-format.c:2128
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "�������� ��� FTP ���� (%s)"
 
-#: mail/mail-format.c:2097
+#: mail/mail-format.c:2142
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "�������� ��� ������� ���� (%s) ������� �� ����� \"%s\""
 
-#: mail/mail-format.c:2102
+#: mail/mail-format.c:2147
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "�������� ��� ������� ���� (%s)"
 
-#: mail/mail-format.c:2131
+#: mail/mail-format.c:2176
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "�������� ��� FTP ���� (%s)"
 
-#: mail/mail-format.c:2139
+#: mail/mail-format.c:2184
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2144
+#: mail/mail-format.c:2189
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:547
+#: mail/mail-local.c:563
 msgid "Reconfiguring folder"
 msgstr ""
 
-#: mail/mail-local.c:620
+#: mail/mail-local.c:636
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:676
+#: mail/mail-local.c:689
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "�� ���� �� ����������� ������� %s �� %s: %s"
 
-#: mail/mail-local.c:722
+#: mail/mail-local.c:735
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "�� ���� �� ������ ������� `%s': %s"
 
-#: mail/mail-local.c:1052
+#: mail/mail-local.c:1075
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1067
+#: mail/mail-local.c:1090
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1089
+#: mail/mail-local.c:1112
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1180
+#: mail/mail-local.c:1200
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-local.c:1190
+#: mail/mail-local.c:1209
 #, c-format
-msgid "Reconfigure %s"
+msgid "Reconfigure /%s"
 msgstr ""
 
-#: mail/mail-mt.c:188
+#: mail/mail-mt.c:199
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -9498,7 +9596,7 @@ msgstr ""
 "������ ��� '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:191
+#: mail/mail-mt.c:202
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -9506,21 +9604,25 @@ msgid ""
 msgstr ""
 
 #. Remember the password?
-#: mail/mail-mt.c:454
+#: mail/mail-mt.c:509
 msgid "Remember this password"
 msgstr "������� ���� ������"
 
-#: mail/mail-mt.c:511
+#: mail/mail-mt.c:510
+msgid "Remember this password for the remainder of this session"
+msgstr ""
+
+#: mail/mail-mt.c:567
 #, fuzzy, c-format
 msgid "Enter Password for %s"
 msgstr "���������� ������ �� %s"
 
-#: mail/mail-mt.c:514
+#: mail/mail-mt.c:570
 #, fuzzy
 msgid "Enter Password"
 msgstr "���������� ������ �� %s"
 
-#: mail/mail-mt.c:824
+#: mail/mail-mt.c:886
 msgid "Working"
 msgstr ""
 
@@ -9673,6 +9775,11 @@ msgstr "�� ���� �� ������ �������: %s"
 msgid "Disconnecting from %s"
 msgstr "��������� ��� �������"
 
+#: mail/mail-ops.c:2065
+#, fuzzy, c-format
+msgid "Reconnecting to %s"
+msgstr "��������� ��� �������"
+
 #: mail/mail-search-dialogue.c:113
 msgid "_Search"
 msgstr "�������"
@@ -9736,12 +9843,12 @@ msgstr ""
 msgid "Type: %s"
 msgstr "���:"
 
-#: mail/mail-send-recv.c:282
+#: mail/mail-send-recv.c:283
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "��������� � ����������� �� ����"
 
-#: mail/mail-send-recv.c:283
+#: mail/mail-send-recv.c:284
 #, fuzzy
 msgid "Cancel All"
 msgstr "����������"
@@ -9765,36 +9872,50 @@ msgstr "����������."
 msgid "User canceled operation."
 msgstr "������������� ����������"
 
-#: mail/mail-tools.c:173
+#: mail/mail-tools.c:133
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "�� ���� �� ������ �������� mbox `%s': %s"
 
-#: mail/mail-tools.c:299
+#: mail/mail-tools.c:259
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "���������� ��������� - %s"
 
-#: mail/mail-tools.c:303
+#: mail/mail-tools.c:263
 #, fuzzy
 msgid "Forwarded message"
 msgstr "���������� ���������"
 
-#: mail/mail-tools.c:439
+#: mail/mail-tools.c:396
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "���������� ���������"
 
-#: mail/mail-vfolder.c:161
+#: mail/mail-vfolder.c:84
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "�������� �� ����� %s"
 
-#: mail/mail-vfolder.c:435
+#: mail/mail-vfolder.c:201
+#, fuzzy, c-format
+msgid "Updating vfolders for uri: %s"
+msgstr "��������� %s ����� �� %s"
+
+#: mail/mail-vfolder.c:414
+#, c-format
+msgid ""
+"The following vFolder(s):\n"
+"%sUsed the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+
+#: mail/mail-vfolder.c:636
 msgid "VFolders"
 msgstr "VFolders"
 
-#: mail/mail-vfolder.c:541
+#: mail/mail-vfolder.c:742
 msgid "New VFolder"
 msgstr "��� VFolder"
 
@@ -9867,7 +9988,7 @@ msgstr ""
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:2331
+#: mail/message-list.c:2334
 #, fuzzy
 msgid "Generating message list"
 msgstr "��������� �� �����������"
@@ -9955,33 +10076,33 @@ msgstr ""
 msgid "Evolution component for the executive summary."
 msgstr ""
 
-#: my-evolution/component-factory.c:30
+#: my-evolution/component-factory.c:45
 msgid "Folder containing the Evolution Summary"
 msgstr ""
 
-#: my-evolution/component-factory.c:139
+#: my-evolution/component-factory.c:154
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:248 my-evolution/e-summary-calendar.c:266
+#: my-evolution/e-summary-calendar.c:263 my-evolution/e-summary-calendar.c:281
 #, fuzzy
 msgid "Appointments"
 msgstr "������ �������"
 
-#: my-evolution/e-summary-calendar.c:249
+#: my-evolution/e-summary-calendar.c:264
 #, fuzzy
 msgid "No appointments"
 msgstr "������ �������"
 
-#: my-evolution/e-summary-calendar.c:286
+#: my-evolution/e-summary-calendar.c:301
 msgid "%k%M %d %B"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:288
+#: my-evolution/e-summary-calendar.c:303
 msgid "%l:%M %d %B"
 msgstr ""
 
-#: my-evolution/e-summary-mail.c:115
+#: my-evolution/e-summary-mail.c:130
 msgid "Mail summary"
 msgstr ""
 
@@ -9989,90 +10110,90 @@ msgstr ""
 #. see in My Evolution by default. You can find the list of all
 #. stations and their codes in Evolution sources
 #. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-preferences.c:65
-#: my-evolution/e-summary-weather.c:615
+#: my-evolution/e-summary-preferences.c:80
+#: my-evolution/e-summary-weather.c:630
 msgid "KBOS:ZSAM:EGAA"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:427
+#: my-evolution/e-summary-preferences.c:441
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:449
+#: my-evolution/e-summary-preferences.c:463
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:890
+#: my-evolution/e-summary-preferences.c:929
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:898
+#: my-evolution/e-summary-preferences.c:937
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:902
+#: my-evolution/e-summary-preferences.c:941
 msgid "Name:"
 msgstr "���:"
 
-#: my-evolution/e-summary-preferences.c:1438
+#: my-evolution/e-summary-preferences.c:1486
 #, fuzzy
 msgid "Summary Settings"
 msgstr "���������"
 
-#: my-evolution/e-summary-rdf.c:277 my-evolution/e-summary-rdf.c:362
-#: my-evolution/e-summary-rdf.c:395
+#: my-evolution/e-summary-rdf.c:297 my-evolution/e-summary-rdf.c:382
+#: my-evolution/e-summary-rdf.c:415
 #, fuzzy
 msgid "Error downloading RDF"
 msgstr "������ ��� ����������� �� %s"
 
-#: my-evolution/e-summary-rdf.c:487
+#: my-evolution/e-summary-rdf.c:507
 #, fuzzy
 msgid "News Feed"
 msgstr "������"
 
-#: my-evolution/e-summary-tasks.c:216
+#: my-evolution/e-summary-tasks.c:238
 #, fuzzy
 msgid "No tasks"
 msgstr "������ ��������"
 
-#: my-evolution/e-summary-tasks.c:255
+#: my-evolution/e-summary-tasks.c:277
 #, fuzzy
 msgid "(No Description)"
 msgstr "(��� ��������)"
 
-#: my-evolution/e-summary-weather.c:57
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:334
+#: my-evolution/e-summary-weather.c:349
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:524
+#: my-evolution/e-summary-weather.c:539
 #, fuzzy
 msgid "Weather"
 msgstr "����"
 
-#: my-evolution/e-summary-weather.c:676
+#: my-evolution/e-summary-weather.c:691
 #, fuzzy
 msgid "Regions"
 msgstr "������:"
 
-#: my-evolution/e-summary.c:162
+#: my-evolution/e-summary.c:187
 msgid "%A, %B %e %Y"
 msgstr ""
 
-#: my-evolution/e-summary.c:512 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:568 ui/my-evolution.xml.h:3
 #, fuzzy
 msgid "Print Summary"
 msgstr "�������"
 
-#: my-evolution/e-summary.c:558
+#: my-evolution/e-summary.c:614
 #, fuzzy
 msgid "Printing of Summary failed"
 msgstr "������������� ���������"
 
-#: my-evolution/main.c:52
+#: my-evolution/main.c:67
 #, fuzzy
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "init_bonobo(): �� ���� �� ������������� Bonobo"
@@ -11511,42 +11632,42 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:174
+#: shell/e-shell-folder-commands.c:176
 msgid "Cannot move a folder over itself."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:178
 #, fuzzy
 msgid "Cannot copy a folder over itself."
 msgstr ""
 "�� ���� �� ������� ��������� �\n"
 "`%s'."
 
-#: shell/e-shell-folder-commands.c:190
+#: shell/e-shell-folder-commands.c:192
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:294
+#: shell/e-shell-folder-commands.c:312
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:299
+#: shell/e-shell-folder-commands.c:317
 #, fuzzy
 msgid "Copy folder"
 msgstr "������� � �����"
 
-#: shell/e-shell-folder-commands.c:337
+#: shell/e-shell-folder-commands.c:359
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:342
+#: shell/e-shell-folder-commands.c:364
 #, fuzzy
 msgid "Move folder"
 msgstr "�������� � �����"
 
-#: shell/e-shell-folder-commands.c:367
+#: shell/e-shell-folder-commands.c:390
 #, fuzzy, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -11555,34 +11676,35 @@ msgstr ""
 "�� ���� �� ������ ������� `%s':\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:383
+#: shell/e-shell-folder-commands.c:406
 #, fuzzy, c-format
-msgid "Delete folder '%s'"
-msgstr "������ �����"
+msgid "Delete \"%s\""
+msgstr "������"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:393
+#: shell/e-shell-folder-commands.c:416
 #, c-format
-msgid "Are you sure you want to remove the '%s' folder?"
+msgid "Are you sure you want to remove the \"%s\" folder?"
 msgstr ""
 
-#. Popup a dialog asking what the user would like to rename
-#. the folder to
-#: shell/e-shell-folder-commands.c:468
+#: shell/e-shell-folder-commands.c:470
 #, fuzzy, c-format
-msgid "Rename folder '%s'"
+msgid ""
+"Cannot rename folder:\n"
+"%s"
+msgstr ""
+"�� ���� �� ������ ������� `%s':\n"
+"%s"
+
+#: shell/e-shell-folder-commands.c:503
+#, fuzzy, c-format
+msgid "Rename the \"%s\" folder to:"
 msgstr "�������� �� ����� %s"
 
-#: shell/e-shell-folder-commands.c:472
+#: shell/e-shell-folder-commands.c:506
 #, fuzzy
-msgid "Rename"
-msgstr "��� �� ����:"
-
-#. Make, pack the label
-#: shell/e-shell-folder-commands.c:480
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "��� �� �����:"
+msgid "Rename folder"
+msgstr "�������� �� ����� %s"
 
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
@@ -11622,13 +11744,13 @@ msgstr "��������� ��� �� ����� � ���������."
 msgid "Evolution - Create new folder"
 msgstr "Evolution - ������ ���� �����"
 
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:99
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:348
+#: shell/e-shell-folder-selection-dialog.c:360
 msgid "New..."
 msgstr "���..."
 
@@ -11636,7 +11758,11 @@ msgstr "���..."
 msgid "(Untitled)"
 msgstr "(����������)"
 
-#: shell/e-shell-importer.c:102
+#: shell/e-shell-importer.c:141
+msgid "Choose the type of importer to run"
+msgstr ""
+
+#: shell/e-shell-importer.c:144
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -11645,9 +11771,13 @@ msgid ""
 "to work it out."
 msgstr ""
 
+#: shell/e-shell-importer.c:150
+msgid "Please select the information that you would like to import"
+msgstr ""
+
 #. Importer isn't ready yet.
 #. Wait 5 seconds and try again.
-#: shell/e-shell-importer.c:197
+#: shell/e-shell-importer.c:242
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11655,83 +11785,106 @@ msgid ""
 "Waiting 5 seconds to retry."
 msgstr ""
 
-#: shell/e-shell-importer.c:217 shell/e-shell-importer.c:248
+#: shell/e-shell-importer.c:262 shell/e-shell-importer.c:293
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:351
+#: shell/e-shell-importer.c:396
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "������� `%s' �� ����������."
 
-#: shell/e-shell-importer.c:363
+#: shell/e-shell-importer.c:408
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:378
+#: shell/e-shell-importer.c:423
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-importer.c:388
+#: shell/e-shell-importer.c:433
 msgid "Importing"
 msgstr ""
 
-#: shell/e-shell-importer.c:396
+#: shell/e-shell-importer.c:441
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:454
 #, fuzzy, c-format
 msgid "Error starting %s"
 msgstr "������ ��� ����������� �� %s"
 
-#: shell/e-shell-importer.c:428
+#: shell/e-shell-importer.c:473
 #, c-format
 msgid "Error loading %s"
 msgstr "������ ��� ����������� �� %s"
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:490
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:560
 msgid "Automatic"
 msgstr "�����������"
 
-#: shell/e-shell-importer.c:566
+#: shell/e-shell-importer.c:611
 msgid "Filename:"
 msgstr "��� �� ����:"
 
-#: shell/e-shell-importer.c:571
+#: shell/e-shell-importer.c:616
 msgid "Select a file"
 msgstr "������ ����"
 
-#: shell/e-shell-importer.c:581
+#: shell/e-shell-importer.c:626
 msgid "File type:"
 msgstr "��� �� ����:"
 
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:651
+msgid "Import data and settings from older programs"
+msgstr ""
+
+#: shell/e-shell-importer.c:655
+msgid "Import a single file"
+msgstr ""
+
+#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:582
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:585
+msgid "Starting Intelligent Importers"
+msgstr ""
+
+#: shell/e-shell-importer.c:840 shell/e-shell-startup-wizard.c:703
+#, fuzzy, c-format
+msgid "From %s:"
+msgstr "��:"
+
+#: shell/e-shell-importer.c:1003
 #, fuzzy
 msgid "Select folder"
 msgstr "������ �����"
 
-#: shell/e-shell-importer.c:646
+#: shell/e-shell-importer.c:1004
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:689 shell/importer/intelligent.c:194
+#: shell/e-shell-importer.c:1116 shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "������"
 
@@ -11751,73 +11904,67 @@ msgstr ""
 msgid "Cannot initialize the Evolution Mailer Wizard interface"
 msgstr "�� ���� �� ������������� mail ����������� �� Evolution."
 
-#: shell/e-shell-startup-wizard.c:582
-msgid ""
-"Please wait...\n"
-"Scanning for existing setups"
-msgstr ""
-
-#: shell/e-shell-startup-wizard.c:585
-msgid "Starting Intelligent Importers"
-msgstr ""
-
-#: shell/e-shell-startup-wizard.c:703
-#, fuzzy, c-format
-msgid "From %s:"
-msgstr "��:"
-
 #: shell/e-shell-startup-wizard.c:745
 msgid ""
 "Please select the information\n"
 "that you would like to import"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:183
+#: shell/e-shell-view-menu.c:201
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy �� ���� ������ � $PATH."
 
-#: shell/e-shell-view-menu.c:191
+#: shell/e-shell-view-menu.c:209
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy �� ���� �� ���� ���������."
 
-#: shell/e-shell-view-menu.c:217
+#: shell/e-shell-view-menu.c:235
 msgid "Ximian Evolution"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:219
+#: shell/e-shell-view-menu.c:237
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:221
+#: shell/e-shell-view-menu.c:239
 msgid ""
 "Ximian Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
 "within the GNOME desktop environment."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:424
+#: shell/e-shell-view-menu.c:442
 msgid "Go to folder..."
 msgstr "����� � �����..."
 
-#: shell/e-shell-view-menu.c:425
+#: shell/e-shell-view-menu.c:443
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:570
+#: shell/e-shell-view-menu.c:563
 #, fuzzy
 msgid "Create a new shortcut"
 msgstr "������ ��� �������"
 
-#: shell/e-shell-view-menu.c:571
+#: shell/e-shell-view-menu.c:564
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:685
+#: shell/e-shell-view-menu.c:595
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:603
+#, fuzzy, c-format
+msgid "Error executing %s."
+msgstr "������ ��� ����������� �� %s"
+
+#: shell/e-shell-view-menu.c:705
 #, fuzzy
 msgid "Work Online"
 msgstr "������� �������"
 
-#: shell/e-shell-view-menu.c:698 shell/e-shell-view-menu.c:711
+#: shell/e-shell-view-menu.c:718 shell/e-shell-view-menu.c:731
 #: ui/evolution.xml.h:30
 msgid "Work Offline"
 msgstr ""
@@ -11826,69 +11973,69 @@ msgstr ""
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:1478
+#: shell/e-shell-view.c:1512
 #, c-format
 msgid "%s (%d)"
 msgstr ""
 
-#: shell/e-shell-view.c:1480
+#: shell/e-shell-view.c:1514
 #, fuzzy
 msgid "(None)"
 msgstr "(���� ���)"
 
-#: shell/e-shell-view.c:1485
+#: shell/e-shell-view.c:1519
 #, c-format
 msgid "%s - Ximian Evolution %s"
 msgstr ""
 
-#: shell/e-shell-view.c:1487
+#: shell/e-shell-view.c:1521
 #, c-format
 msgid "%s - Ximian Evolution %s [%s]"
 msgstr ""
 
-#: shell/e-shell-view.c:1527
+#: shell/e-shell-view.c:1561
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1534
+#: shell/e-shell-view.c:1568
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1540
+#: shell/e-shell-view.c:1574
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:560
+#: shell/e-shell.c:562
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1496
+#: shell/e-shell.c:1488
 #, c-format
 msgid ""
 "Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
 "This probably means that the %s component has crashed."
 msgstr ""
 
-#: shell/e-shell.c:1700 widgets/misc/e-cell-date-edit.c:248
+#: shell/e-shell.c:1692 widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr ""
 
-#: shell/e-shell.c:1702
+#: shell/e-shell.c:1694
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:1704
+#: shell/e-shell.c:1696
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:1706
+#: shell/e-shell.c:1698
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:1708 shell/e-storage.c:491
+#: shell/e-shell.c:1700 shell/e-storage.c:496
 msgid "Generic error"
 msgstr ""
 
@@ -12017,52 +12164,61 @@ msgstr ""
 msgid "Shortcuts"
 msgstr ""
 
+#: shell/e-storage-set-view.c:645
+#, fuzzy, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr ""
+"�� ���� �� ������ ������� `%s':\n"
+"%s"
+
 #: shell/e-storage.c:182 shell/e-storage.c:188
 msgid "(No name)"
 msgstr "(���� ���)"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:494
 msgid "No error"
 msgstr "���� ������"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:498
 msgid "A folder with the same name already exists"
 msgstr "����� ��� ������ ��� ���� ����������"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:500
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:502
 msgid "I/O error"
 msgstr "������/������� ������"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:504
 msgid "Not enough space to create the folder"
 msgstr "���� ���������� ������������ �� ����������� �� �����"
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:506
 msgid "The specified folder was not found"
 msgstr "���������� ����� �� � ��������"
 
-#: shell/e-storage.c:503
+#: shell/e-storage.c:508
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:512
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:514
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:516
 #, fuzzy
 msgid "The specified folder cannot be modified or removed"
 msgstr "���������� ����� �� � ��������"
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:518
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
@@ -12094,6 +12250,10 @@ msgstr "������:"
 msgid "The following connections are currently active:"
 msgstr ""
 
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr "��� �� �����:"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder type:"
 msgstr "��� �� �����:"
@@ -12147,15 +12307,25 @@ msgid "Evolution Importer Assistant"
 msgstr ""
 
 #: shell/importer/import.glade.h:4
-msgid "Import File (Step 2 of 2)"
-msgstr ""
+#, fuzzy
+msgid "Import File (step 3 of 3)"
+msgstr "������ ����"
 
 #: shell/importer/import.glade.h:5
+msgid "Importer Type (step 1 of 3)"
+msgstr ""
+
+#: shell/importer/import.glade.h:6
 #, fuzzy
-msgid "Select a File (step 1 of 2)"
+msgid "Select Importers (step 2 of 3)"
 msgstr "������ ����"
 
-#: shell/importer/import.glade.h:6
+#: shell/importer/import.glade.h:7
+#, fuzzy
+msgid "Select a File (step 2 of 3)"
+msgstr "������ ����"
+
+#: shell/importer/import.glade.h:8
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of\n"
@@ -12374,13 +12544,6 @@ msgstr "���_�� �� ��������"
 msgid "_Select All"
 msgstr "������ ������"
 
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:44
-#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
-#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:19
-#: ui/my-evolution.xml.h:9
-msgid "_Tools"
-msgstr "���_��������"
-
 #: ui/evolution-calendar.xml.h:2
 msgid "Configure the calendar's settings"
 msgstr ""
@@ -12573,8 +12736,8 @@ 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:49
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:36
 msgid "_File"
 msgstr "_����"
@@ -12595,8 +12758,8 @@ msgstr ""
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:54
-#: ui/evolution-signature-editor.xml.h:11
+#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Save"
 msgstr "_�������"
 
@@ -13268,6 +13431,11 @@ msgstr "�������"
 msgid "_Open Message"
 msgstr "_���������"
 
+#: ui/evolution-mail-message.xml.h:98 ui/evolution.xml.h:49
+#: ui/my-evolution.xml.h:9
+msgid "_Tools"
+msgstr "���_��������"
+
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "������� ���� ��������"
@@ -13279,8 +13447,8 @@ msgstr "������� ���� ��������"
 msgid "_Close"
 msgstr "�������"
 
-#: ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:48
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:50
 msgid "_View"
 msgstr "_������"
 
@@ -13447,39 +13615,34 @@ msgid "_Cc Field"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:46
-#: ui/evolution-signature-editor.xml.h:6
-msgid "_Debug"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:47
 #, fuzzy
 msgid "_Delete all"
 msgstr "������"
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:49
 msgid "_From Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:51
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-signature-editor.xml.h:9
 #, fuzzy
 msgid "_Insert"
 msgstr "_������"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:51
 msgid "_Open..."
 msgstr "_������..."
 
-#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-message-composer.xml.h:52
 #, fuzzy
 msgid "_Reply-To Field"
 msgstr "�������-��:"
 
-#: ui/evolution-message-composer.xml.h:55
+#: ui/evolution-message-composer.xml.h:54
 msgid "_Security"
 msgstr "_���������"
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "_�����"
 
@@ -13622,7 +13785,7 @@ msgid "Exit the program"
 msgstr "����� �� ����������"
 
 #: ui/evolution.xml.h:15
-msgid "Import an external file format"
+msgid "Import data from other programs"
 msgstr ""
 
 #: ui/evolution.xml.h:17
@@ -13703,7 +13866,7 @@ msgstr "����� � �����..."
 
 #: ui/evolution.xml.h:41
 #, fuzzy
-msgid "_Import File..."
+msgid "_Import..."
 msgstr "������ ����..."
 
 #: ui/evolution.xml.h:42
@@ -13722,18 +13885,23 @@ msgstr "��� VFolder"
 
 #: ui/evolution.xml.h:45
 #, fuzzy
+msgid "_Pilot Settings..."
+msgstr "���������..."
+
+#: ui/evolution.xml.h:46
+#, fuzzy
 msgid "_Rename..."
 msgstr "_������..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:47
 msgid "_Shortcut"
 msgstr ""
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:48
 msgid "_Shortcut Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:51
 msgid "_Work Offline"
 msgstr ""
 
@@ -13844,11 +14012,11 @@ msgstr ""
 msgid "%B %Y"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:433
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:439
 msgid "Now"
 msgstr "����"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:445
 msgid "Today"
 msgstr "����"
 
@@ -14002,23 +14170,49 @@ msgstr "�������� �� ������"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr ""
 
-#: wombat/wombat.c:175
+#: wombat/wombat.c:176
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): �� ���� �� ������������� GNOME-VFS"
 
-#: wombat/wombat.c:187
+#: wombat/wombat.c:188
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): �� ���� �� ������������� GNOME"
 
-#: wombat/wombat.c:200
+#: wombat/wombat.c:201
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): �� ���� �� ������������� Bonobo"
 
 #, fuzzy
-#~ msgid "Cannot open folder: %s: No such folder"
-#~ msgstr ""
-#~ "�� ���� �� ������ ������� `%s':\n"
-#~ "%s"
+#~ msgid "_Calendar Information:"
+#~ msgstr "���������� ����������"
+
+#, fuzzy
+#~ msgid "before start of appointment"
+#~ msgstr " ���� �������� �� �������"
+
+#, fuzzy
+#~ msgid "after start of appointment"
+#~ msgstr " ���� �������� �� �������"
+
+#, fuzzy
+#~ msgid "before end of appointment"
+#~ msgstr " ����� ���� �� �������"
+
+#, fuzzy
+#~ msgid "Each account must have a different name."
+#~ msgstr "������� �������� ���� � �������� ���"
+
+#, fuzzy
+#~ msgid "Delete folder '%s'"
+#~ msgstr "������ �����"
+
+#, fuzzy
+#~ msgid "Rename"
+#~ msgstr "��� �� ����:"
+
+#, fuzzy
+#~ msgid "_Import File..."
+#~ msgstr "������ ����..."
 
 #~ msgid "_Company:"
 #~ msgstr "��������:"
@@ -14250,9 +14444,6 @@ msgstr "init_bonobo(): �� ���� �� ������������� Bonobo"
 #~ msgid "%s message %d of %d (uid \"%s\")"
 #~ msgstr "%s ��������� %d �� %d (uid \"%s\")"
 
-#~ msgid "Loading %s Folder for %s"
-#~ msgstr "��������� %s ����� �� %s"
-
 #~ msgid "Load %s Folder for %s"
 #~ msgstr "������ %s ����� �� %s"
 
diff --git a/po/ca.po b/po/ca.po
index 1fc40129b0..e965ee1b52 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: 2001-09-21 18:31-0400\n"
+"POT-Creation-Date: 2001-10-01 19: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"
@@ -34,299 +34,299 @@ msgid "Name"
 msgstr "Nom"
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#, fuzzy
-msgid "Family Name"
-msgstr "Nom complet:"
-
-#: addressbook/backend/ebook/e-card-simple.c:61
 #: addressbook/gui/widgets/e-addressbook-view.c:870
 #, fuzzy
 msgid "Email"
 msgstr "Adre�a electr�nica 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:61
 #: addressbook/gui/contact-editor/e-contact-editor.c:1609
 msgid "Primary"
 msgstr "Primari"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:61
 #, fuzzy
 msgid "Prim"
 msgstr "Primari"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:92
 #: addressbook/gui/contact-editor/e-contact-editor.c:1594
 #: addressbook/gui/widgets/e-addressbook-view.c:902
 msgid "Assistant"
 msgstr "Assistent"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/gui/contact-editor/e-contact-editor.c:1595
 #: addressbook/gui/contact-editor/e-contact-editor.c:1662
 msgid "Business"
 msgstr "Feina"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/backend/ebook/e-card-simple.c:68
 #, fuzzy
 msgid "Bus"
 msgstr "Ocupat"
 
-#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/gui/contact-editor/e-contact-editor.c:1598
 msgid "Callback"
 msgstr "Crida de retorn"
 
-#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/gui/contact-editor/e-contact-editor.c:1600
 msgid "Company"
 msgstr "Empresa"
 
-#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:65
 #, fuzzy
 msgid "Comp"
 msgstr "Copia"
 
-#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:69
 #: addressbook/gui/contact-editor/e-contact-editor.c:1601
 #: addressbook/gui/contact-editor/e-contact-editor.c:1663
 msgid "Home"
 msgstr "Particular"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:67
 #: addressbook/gui/widgets/e-addressbook-view.c:877
 msgid "Organization"
 msgstr "Organitzaci�"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:67
 msgid "Org"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/e-contact-editor.c:1605
 msgid "Mobile"
 msgstr "M�bil"
 
-#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/e-contact-editor.c:1599
 msgid "Car"
 msgstr "Cotxe"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/e-contact-editor.c:1597
 #: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "Business Fax"
 msgstr "Fax de la feina"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/backend/ebook/e-card-simple.c:72
 #, fuzzy
 msgid "Bus Fax"
 msgstr "Fax de la feina"
 
-#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/backend/ebook/e-card-simple.c:73
 #: addressbook/gui/contact-editor/e-contact-editor.c:1603
 #: addressbook/gui/widgets/e-addressbook-view.c:883
 msgid "Home Fax"
 msgstr "Fax particular"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/e-contact-editor.c:1596
 msgid "Business 2"
 msgstr "Feina 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/backend/ebook/e-card-simple.c:74
 #, fuzzy
 msgid "Bus 2"
 msgstr "Ocupat"
 
-#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/backend/ebook/e-card-simple.c:75
 #: addressbook/gui/contact-editor/e-contact-editor.c:1602
 msgid "Home 2"
 msgstr "Particular 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/backend/ebook/e-card-simple.c:76
 #: addressbook/gui/contact-editor/e-contact-editor.c:1604
 #: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "ISDN"
 msgstr "XDSI"
 
-#: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/backend/ebook/e-card-simple.c:83
 #: addressbook/gui/contact-editor/e-contact-editor.c:1606
 #: addressbook/gui/contact-editor/e-contact-editor.c:1664
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:52
 msgid "Other"
 msgstr "Altres"
 
-#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/backend/ebook/e-card-simple.c:78
 #: addressbook/gui/contact-editor/e-contact-editor.c:1607
 #: addressbook/gui/widgets/e-addressbook-view.c:888
 msgid "Other Fax"
 msgstr "Un altre fax"
 
-#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/gui/contact-editor/e-contact-editor.c:1608
 #: addressbook/gui/widgets/e-addressbook-view.c:889
 msgid "Pager"
 msgstr "Busca"
 
-#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/backend/ebook/e-card-simple.c:80
 #: addressbook/gui/contact-editor/e-contact-editor.c:1610
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 msgid "Radio"
 msgstr "R�dio"
 
-#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/backend/ebook/e-card-simple.c:81
 #: addressbook/gui/contact-editor/e-contact-editor.c:1611
 #: addressbook/gui/widgets/e-addressbook-view.c:891
 msgid "Telex"
 msgstr "T�lex"
 
-#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/backend/ebook/e-card-simple.c:82
 #: addressbook/gui/widgets/e-addressbook-view.c:892
 #, fuzzy
 msgid "TTY"
 msgstr "TTY/TDD"
 
-#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/backend/ebook/e-card-simple.c:84
 #: addressbook/gui/component/e-address-popup.c:476
 #: addressbook/gui/contact-editor/e-contact-editor.c:1637
 #: addressbook/gui/widgets/e-addressbook-view.c:894
 msgid "Email 2"
 msgstr "Adre�a electr�nica 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/backend/ebook/e-card-simple.c:85
 #: addressbook/gui/component/e-address-popup.c:486
 #: addressbook/gui/contact-editor/e-contact-editor.c:1638
 #: addressbook/gui/widgets/e-addressbook-view.c:895
 msgid "Email 3"
 msgstr "Adre�a electr�nica 3"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/widgets/e-addressbook-view.c:896
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:86
 msgid "Url"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/widgets/e-addressbook-view.c:897
 #, fuzzy
 msgid "Department"
 msgstr "_Departament:"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:87
 msgid "Dep"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/backend/ebook/e-card-simple.c:88
 #: addressbook/gui/widgets/e-addressbook-view.c:898
 #, fuzzy
 msgid "Office"
 msgstr "_Oficina"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/backend/ebook/e-card-simple.c:88
 #, fuzzy
 msgid "Off"
 msgstr "_Oficina"
 
-#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card-simple.c:89
 #: addressbook/gui/widgets/e-addressbook-view.c:899
 #, fuzzy
 msgid "Title"
 msgstr "_T�tol:"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:90
 #: addressbook/gui/widgets/e-addressbook-view.c:900
 #, fuzzy
 msgid "Profession"
 msgstr "_Professi�:"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Prof"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:91
 #: addressbook/gui/widgets/e-addressbook-view.c:901
 #, fuzzy
 msgid "Manager"
 msgstr "Busca"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:91
 #, fuzzy
 msgid "Man"
 msgstr "Dilluns"
 
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:92
 msgid "Ass"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card-simple.c:93
 #: addressbook/gui/widgets/e-addressbook-view.c:903
 #, fuzzy
 msgid "Nickname"
 msgstr "_Sobrenom:"
 
-#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card-simple.c:93
 #, fuzzy
 msgid "Nick"
 msgstr "_Sobrenom:"
 
-#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/backend/ebook/e-card-simple.c:94
 #: addressbook/gui/widgets/e-addressbook-view.c:904
 #, fuzzy
 msgid "Spouse"
 msgstr "_C�njuge:"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card-simple.c:95
 #: addressbook/gui/widgets/e-addressbook-view.c:905
 #, fuzzy
 msgid "Note"
 msgstr "Cap"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:96
 #, fuzzy
 msgid "Calendar URI"
 msgstr "Agenda"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:96
 msgid "CALUri"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:97
 #: addressbook/gui/widgets/e-addressbook-view.c:906
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:97
 msgid "FBUrl"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:98
 #, fuzzy
 msgid "Anniversary"
 msgstr "Ani_versari:"
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "Anniv"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card-simple.c:99
 #, fuzzy
 msgid "Birth Date"
 msgstr "Data d'ini_ci:"
 
-#: addressbook/backend/ebook/e-card-simple.c:103
+#: addressbook/backend/ebook/e-card-simple.c:102
 #: calendar/gui/e-calendar-table.etspec.h:4
 #, fuzzy
 msgid "Categories"
 msgstr "categories"
 
+#: addressbook/backend/ebook/e-card-simple.c:103
+#, fuzzy
+msgid "Family Name"
+msgstr "Nom complet:"
+
 #: addressbook/backend/ebook/e-card.c:3564
 #, fuzzy
 msgid "Card: "
@@ -572,10 +572,10 @@ msgstr "Si us plau, introdu�u la contrasenya NNTP per a %s@%s"
 #: 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:1119
+#: addressbook/conduit/address-conduit.c:1167
 #: addressbook/gui/component/addressbook-factory.c:48
-#: calendar/conduits/calendar/calendar-conduit.c:1204
-#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/conduits/calendar/calendar-conduit.c:1262
+#: calendar/conduits/todo/todo-conduit.c:1034
 #: calendar/gui/alarm-notify/notify-main.c:78 calendar/gui/main.c:63
 msgid "Could not initialize Bonobo"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
@@ -647,20 +647,20 @@ msgstr ""
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:681
-#: calendar/conduits/calendar/calendar-conduit.c:778
-#: calendar/conduits/todo/todo-conduit.c:592
+#: addressbook/conduit/address-conduit.c:731
+#: calendar/conduits/calendar/calendar-conduit.c:837
+#: calendar/conduits/todo/todo-conduit.c:609
 msgid "Could not start wombat server"
 msgstr "No s'ha pogut iniciar el servidor wombat"
 
-#: addressbook/conduit/address-conduit.c:682
-#: calendar/conduits/calendar/calendar-conduit.c:779
-#: calendar/conduits/todo/todo-conduit.c:593
+#: addressbook/conduit/address-conduit.c:732
+#: calendar/conduits/calendar/calendar-conduit.c:838
+#: calendar/conduits/todo/todo-conduit.c:610
 msgid "Could not start wombat"
 msgstr "No s'ha pogut iniciar el wombat"
 
-#: addressbook/conduit/address-conduit.c:714
-#: addressbook/conduit/address-conduit.c:717
+#: addressbook/conduit/address-conduit.c:762
+#: addressbook/conduit/address-conduit.c:765
 msgid "Could not read pilot's Address application block"
 msgstr "No s'ha pogut llegir el bloc d'aplicaci� d'adre�a del Pilot"
 
@@ -712,8 +712,8 @@ msgid "Factory for the sample Addressbook control"
 msgstr "Feu clic aqu� per a la llibreta d'adreces"
 
 #: addressbook/gui/component/addressbook-component.c:66
-#: calendar/gui/dialogs/comp-editor-util.c:281
-#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:173
+#: calendar/gui/dialogs/comp-editor-util.c:289
+#: calendar/gui/dialogs/comp-editor-util.c:345 shell/e-local-storage.c:173
 #: shell/e-shortcuts.c:1062
 #, fuzzy
 msgid "Contacts"
@@ -738,23 +738,23 @@ msgstr ""
 "Error en carregar la informaci� del filtre:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-component.c:386
+#: addressbook/gui/component/addressbook-component.c:411
 #: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "New Contact"
 msgstr "Visualitza tots els contactes"
 
-#: addressbook/gui/component/addressbook-component.c:386
+#: addressbook/gui/component/addressbook-component.c:411
 #, fuzzy
 msgid "New _Contact"
 msgstr "Visualitza tots els contactes"
 
-#: addressbook/gui/component/addressbook-component.c:387
+#: addressbook/gui/component/addressbook-component.c:412
 #, fuzzy
 msgid "New Contact List"
 msgstr "Visualitza tots els contactes"
 
-#: addressbook/gui/component/addressbook-component.c:387
+#: addressbook/gui/component/addressbook-component.c:412
 #, fuzzy
 msgid "New Contact _List"
 msgstr "Visualitza tots els contactes"
@@ -868,19 +868,19 @@ msgid "_Account name:"
 msgstr "cont�"
 
 #: addressbook/gui/component/addressbook-config.glade.h:22
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: 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:90 my-evolution/my-evolution.glade.h:20
+#: mail/mail-config.glade.h:91 my-evolution/my-evolution.glade.h:20
 msgid "_Add"
 msgstr "_Afegeix"
 
 #: addressbook/gui/component/addressbook-config.glade.h:23
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:95
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:96
 #: ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
 #: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
 msgstr "_Edita"
@@ -907,38 +907,38 @@ msgstr "Servidor:"
 msgid "Other Contacts"
 msgstr "Contacte _nou"
 
-#: addressbook/gui/component/addressbook.c:393
+#: addressbook/gui/component/addressbook.c:407
 #, fuzzy, c-format
 msgid "Please enter your email address and password for access to %s"
 msgstr "Si us plau, introdu�u la vostra contrasenya PGP/GPG."
 
-#: addressbook/gui/component/addressbook.c:401
+#: addressbook/gui/component/addressbook.c:415
 #, fuzzy
 msgid "LDAP Authentication"
 msgstr "Autenticaci�:"
 
-#: addressbook/gui/component/addressbook.c:412
+#: addressbook/gui/component/addressbook.c:426
 #, fuzzy
 msgid "Email Address:"
 msgstr "Adre�a electr�nica:"
 
-#: addressbook/gui/component/addressbook.c:425
+#: addressbook/gui/component/addressbook.c:439
 #, fuzzy
 msgid "Password:"
 msgstr "Contrasenya"
 
-#: addressbook/gui/component/addressbook.c:488
+#: addressbook/gui/component/addressbook.c:502
 msgid "Unable to open addressbook"
 msgstr "No es pot obrir la llibreta d'adreces"
 
-#: addressbook/gui/component/addressbook.c:495
+#: addressbook/gui/component/addressbook.c:509
 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:500
+#: addressbook/gui/component/addressbook.c:514
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -946,49 +946,49 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:508
+#: addressbook/gui/component/addressbook.c:522
 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:649
+#: addressbook/gui/component/addressbook.c:663
 #: calendar/gui/cal-search-bar.c:55
 #, fuzzy
 msgid "Any field contains"
 msgstr "El cos cont�"
 
-#: addressbook/gui/component/addressbook.c:650
+#: addressbook/gui/component/addressbook.c:664
 #, fuzzy
 msgid "Name contains"
 msgstr "cont�"
 
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:665
 #, fuzzy
 msgid "Email contains"
 msgstr "cont�"
 
-#: addressbook/gui/component/addressbook.c:652
+#: addressbook/gui/component/addressbook.c:666
 #: calendar/gui/cal-search-bar.c:59
 #, fuzzy
 msgid "Category is"
 msgstr "categories"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:653 widgets/misc/e-filter-bar.h:97
+#: addressbook/gui/component/addressbook.c:667 widgets/misc/e-filter-bar.h:97
 #: widgets/misc/e-filter-bar.h:104
 #, fuzzy
 msgid "Advanced..."
 msgstr "Afegeix..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:883
+#: addressbook/gui/component/addressbook.c:897
 #: calendar/gui/cal-search-bar.c:412
 #, fuzzy
 msgid "Any Category"
 msgstr "categories"
 
-#: addressbook/gui/component/addressbook.c:925
+#: addressbook/gui/component/addressbook.c:939
 msgid "The URI that the Folder Browser will display"
 msgstr "L'URI que mostrar� el navegador de carpetes"
 
@@ -1003,7 +1003,7 @@ msgid "(none)"
 msgstr "(Sense nom)"
 
 #: addressbook/gui/component/e-address-popup.c:466
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #: addressbook/gui/contact-editor/e-contact-editor.c:1636
 msgid "Primary Email"
 msgstr "Adre�a electr�nica principal"
@@ -1186,121 +1186,127 @@ msgid "Details"
 msgstr "Detalls"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
+msgid "F_ree/Busy URL:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 #, fuzzy
 msgid "File A_s:"
 msgstr "Arxiva com:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "General"
 msgstr "General"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+msgid ""
+"If this person publishes free/busy or other calendar information on the "
+"Internet, enter the address\n"
+"of that information here."
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "New phone type"
 msgstr "Nou tipus de tel�fon"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "No_tes:"
 msgstr "No_tes:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #, fuzzy
 msgid "Organi_zation:"
 msgstr "Organitzaci�:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "Phone Types"
 msgstr "Tipus de tel�fon"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "Wants to receive _HTML mail"
 msgstr "Vol rebre correu _HTML"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Address..."
 msgstr "_Adre�a..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "_Assistant's name:"
 msgstr "_Nom de l'assistent:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Birthday:"
 msgstr "_Data de naixement:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Business"
 msgstr "_Feina"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#, fuzzy
-msgid "_Calendar Information:"
-msgstr "Cap informaci�"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 #: calendar/gui/dialogs/event-page.glade.h:12
 #: calendar/gui/dialogs/task-page.glade.h:10
 msgid "_Contacts..."
 msgstr "_Contactes..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:834 filter/filter.glade.h:8
-#: mail/folder-browser.c:1371 mail/mail-config.glade.h:94
+#: mail/folder-browser.c:1406 mail/mail-config.glade.h:95
 #: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "_Suprimeix"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Department:"
 msgstr "_Departament:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#, fuzzy
-msgid "_Free/Busy Information:"
-msgstr "Cap informaci�"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Full Name..."
 msgstr "Nom _complet..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Home"
 msgstr "_Particular"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Job title:"
 msgstr "_C�rrec:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Manager's Name:"
 msgstr "_Nom del gestor:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Mobile"
 msgstr "_M�bil"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Nickname:"
 msgstr "_Sobrenom:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Office:"
 msgstr "_Oficina"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Profession:"
 msgstr "_Professi�:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#, fuzzy
+msgid "_Public Calendar URL:"
+msgstr "Agenda"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Spouse:"
 msgstr "_C�njuge:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_This is the mailing address"
 msgstr "_Aquesta �s l'adre�a de correu"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "_Web page address:"
 msgstr "Adre�a de p�gina web:"
@@ -2573,7 +2579,7 @@ msgstr " segons"
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
 #: addressbook/gui/widgets/e-addressbook-view.c:691
 #: addressbook/gui/widgets/e-addressbook-view.c:753
-#: addressbook/gui/widgets/e-addressbook-view.c:1373
+#: addressbook/gui/widgets/e-addressbook-view.c:1422
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Desa com a VCard"
@@ -2633,8 +2639,8 @@ msgid "Success"
 msgstr "Fonts"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1710
-#: shell/e-storage.c:515
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1702
+#: shell/e-storage.c:520
 msgid "Unknown error"
 msgstr "Error desconegut"
 
@@ -2643,7 +2649,7 @@ msgstr "Error desconegut"
 msgid "Repository offline"
 msgstr "S'est� movent"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:505
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:510
 msgid "Permission denied"
 msgstr "Perm�s denegat"
 
@@ -2662,10 +2668,10 @@ msgid "Protocol not supported"
 msgstr "Operaci� no suportada"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:733 calendar/gui/calendar-model.c:1274
+#: calendar/gui/calendar-model.c:726 calendar/gui/calendar-model.c:1247
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:544
-#: camel/camel-service.c:580
+#: calendar/gui/e-calendar-table.c:461 camel/camel-service.c:598
+#: camel/camel-service.c:634
 #, fuzzy
 msgid "Cancelled"
 msgstr "Cancel�lat"
@@ -2696,7 +2702,7 @@ msgid "Error removing list"
 msgstr "Error en carregar el fitxer: %s"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1248
+#: addressbook/gui/widgets/e-addressbook-view.c:1297
 #, fuzzy
 msgid "Error removing card"
 msgstr "Error en llegir el fitxer de correu: %s"
@@ -2988,8 +2994,8 @@ msgstr "Lletra..."
 msgid "Print cards"
 msgstr "Imprimeix l'agenda"
 
-#: addressbook/printing/e-contact-print.c:1112
-#: addressbook/printing/e-contact-print.c:1134
+#: addressbook/printing/e-contact-print.c:1152
+#: addressbook/printing/e-contact-print.c:1174
 #, fuzzy
 msgid "Print card"
 msgstr "Imprimeix l'agenda"
@@ -3000,18 +3006,44 @@ msgstr "Imprimeix l'agenda"
 msgid "Print envelope"
 msgstr "Imprimeix el missatge..."
 
-#: calendar/conduits/calendar/calendar-conduit.c:735
-#: calendar/conduits/todo/todo-conduit.c:548
+#: calendar/cal-util/cal-util.c:418 calendar/cal-util/cal-util.c:440
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:385 mail/message-list.c:652
+msgid "High"
+msgstr "Alta"
+
+#: calendar/cal-util/cal-util.c:420 calendar/cal-util/cal-util.c:442
+#: calendar/gui/calendar-model.c:1673
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:386 mail/message-list.c:651
+msgid "Normal"
+msgstr "Normal"
+
+#: calendar/cal-util/cal-util.c:422 calendar/cal-util/cal-util.c:444
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:387 mail/message-list.c:650
+msgid "Low"
+msgstr "Baixa"
+
+#. An empty string is the same as 'None'.
+#: calendar/cal-util/cal-util.c:438
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:388
+msgid "Undefined"
+msgstr ""
+
+#: calendar/conduits/calendar/calendar-conduit.c:793
+#: calendar/conduits/todo/todo-conduit.c:564
 msgid "Error while communicating with calendar server"
 msgstr "Error en comunicar-se amb el servidor d'agenda"
 
-#: calendar/conduits/calendar/calendar-conduit.c:839
-#: calendar/conduits/calendar/calendar-conduit.c:842
+#: calendar/conduits/calendar/calendar-conduit.c:896
+#: calendar/conduits/calendar/calendar-conduit.c:899
 msgid "Could not read pilot's Calendar application block"
 msgstr "No s'ha pogut llegir el bloc d'aplicaci� d'agenda del Pilot"
 
-#: calendar/conduits/todo/todo-conduit.c:653
-#: calendar/conduits/todo/todo-conduit.c:656
+#: calendar/conduits/todo/todo-conduit.c:668
+#: calendar/conduits/todo/todo-conduit.c:671
 msgid "Could not read pilot's ToDo application block"
 msgstr "No s'ha pogut llegir el bloc d'aplicaci� de coses per fer del Pilot"
 
@@ -3067,47 +3099,47 @@ msgstr ""
 msgid "Factory for the alarm notification service"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:152
 #, fuzzy, c-format
 msgid "Notification about your appointment starting on %s and ending on %s"
 msgstr "Notificaci� sobre la vostra cita el %A %d de %b de %Y, a les %H:%M"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:156
 #, fuzzy, c-format
 msgid "Notification about your appointment starting on %s"
 msgstr "Notificaci� sobre la vostra cita el %A %d de %b de %Y, a les %H:%M"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:161
 #, fuzzy, c-format
 msgid "Notification about your appointment ending on %s"
 msgstr "Notificaci� sobre la vostra cita el %A %d de %b de %Y, a les %H:%M"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:165
 #, fuzzy
 msgid "Notification about your appointment"
 msgstr "Notificaci� sobre la vostra cita el %A %d de %b de %Y, a les %H:%M"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:172
 #, fuzzy, c-format
 msgid "Notification about your task starting on %s and ending on %s"
 msgstr "Notificaci� sobre la vostra cita el %A %d de %b de %Y, a les %H:%M"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:176
 #, fuzzy, c-format
 msgid "Notification about your task starting on %s"
 msgstr "Notificaci� sobre la vostra cita el %A %d de %b de %Y, a les %H:%M"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:181
 #, fuzzy, c-format
 msgid "Notification about your task ending on %s"
 msgstr "Notificaci� sobre la vostra cita el %A %d de %b de %Y, a les %H:%M"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:185
 #, fuzzy
 msgid "Notification about your task"
 msgstr "Mostra informaci� referent a l'Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:267
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "Alarma el %A %d de %b de %Y, a les %H:%M"
 
@@ -3198,7 +3230,7 @@ msgstr "%A, %d de %B de %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: calendar/gui/calendar-commands.c:467
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1442
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1446
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -3207,17 +3239,17 @@ msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:399 calendar/gui/calendar-model.c:1001
-#: calendar/gui/e-calendar-table.c:307
+#: calendar/gui/calendar-model.c:399 calendar/gui/calendar-model.c:994
+#: calendar/gui/e-calendar-table.c:364
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:1003
-#: calendar/gui/e-calendar-table.c:308
+#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:996
+#: calendar/gui/e-calendar-table.c:365
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:306
+#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:363
 msgid "Public"
 msgstr "P�blic"
 
@@ -3237,69 +3269,50 @@ msgstr "E"
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:538 calendar/gui/calendar-model.c:1183
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:652
-msgid "High"
-msgstr "Alta"
-
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1185
-#: calendar/gui/calendar-model.c:1700
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:651
-msgid "Normal"
-msgstr "Normal"
-
-#: calendar/gui/calendar-model.c:542 calendar/gui/calendar-model.c:1187
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:650
-msgid "Low"
-msgstr "Baixa"
-
-#: calendar/gui/calendar-model.c:573 calendar/gui/calendar-model.c:1220
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/calendar-model.c:566 calendar/gui/calendar-model.c:1193
+#: calendar/gui/e-calendar-table.c:437
 #, fuzzy
 msgid "Free"
 msgstr "setmana"
 
-#: calendar/gui/calendar-model.c:575 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/calendar-model.c:568 calendar/gui/e-calendar-table.c:438
 #: calendar/gui/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr "Ocupat"
 
-#: calendar/gui/calendar-model.c:724 calendar/gui/calendar-model.c:1268
+#: calendar/gui/calendar-model.c:717 calendar/gui/calendar-model.c:1241
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:401
+#: calendar/gui/e-calendar-table.c:458
 msgid "Not Started"
 msgstr "No iniciat"
 
-#: calendar/gui/calendar-model.c:727 calendar/gui/calendar-model.c:1270
+#: calendar/gui/calendar-model.c:720 calendar/gui/calendar-model.c:1243
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:402
+#: calendar/gui/e-calendar-table.c:459
 msgid "In Progress"
 msgstr "En proc�s"
 
-#: calendar/gui/calendar-model.c:730 calendar/gui/calendar-model.c:1272
+#: calendar/gui/calendar-model.c:723 calendar/gui/calendar-model.c:1245
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-meeting-model.c:298
+#: calendar/gui/e-calendar-table.c:460 calendar/gui/e-meeting-model.c:298
 #: calendar/gui/e-meeting-model.c:321
 #, fuzzy
 msgid "Completed"
 msgstr "% comp_let:"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:915 e-util/e-time-utils.c:163
+#: calendar/gui/calendar-model.c:908 e-util/e-time-utils.c:163
 #: e-util/e-time-utils.c:354
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:918 e-util/e-time-utils.c:158
+#: calendar/gui/calendar-model.c:911 e-util/e-time-utils.c:158
 #: e-util/e-time-utils.c:363
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:923
+#: calendar/gui/calendar-model.c:916
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -3310,7 +3323,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:1087
+#: calendar/gui/calendar-model.c:1080
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3320,49 +3333,38 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1127
+#: calendar/gui/calendar-model.c:1120
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "El valor de percentatge ha d'estar entre 0 i 100, ambd�s inclosos"
 
-#: calendar/gui/calendar-model.c:1168
-msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
-msgstr ""
-
-#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1181
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:331
-msgid "Undefined"
-msgstr ""
-
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1266 calendar/gui/dialogs/meeting-page.c:332
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1444
+#: calendar/gui/calendar-model.c:1239 calendar/gui/dialogs/meeting-page.c:332
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1446
 #: mail/mail-accounts.c:143 mail/mail-accounts.c:390
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:50
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:203
-#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
-#: widgets/misc/e-dateedit.c:1428 widgets/misc/e-dateedit.c:1543
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:453
+#: widgets/misc/e-dateedit.c:1453 widgets/misc/e-dateedit.c:1568
 msgid "None"
 msgstr "Cap"
 
-#: calendar/gui/calendar-model.c:1702
+#: calendar/gui/calendar-model.c:1675
 #, fuzzy
 msgid "Recurring"
 msgstr "Recurr�ncia"
 
-#: calendar/gui/calendar-model.c:1704
+#: calendar/gui/calendar-model.c:1677
 #, fuzzy
 msgid "Assigned"
 msgstr "Assigna una puntuaci�"
 
-#: calendar/gui/calendar-model.c:1710 calendar/gui/e-meeting-model.c:270
+#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:270
 #: calendar/gui/e-meeting-model.c:280 calendar/gui/e-meeting-model.c:506
 #: calendar/gui/e-meeting-model.c:702
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1710 calendar/gui/e-meeting-model.c:282
+#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:282
 #: calendar/gui/e-meeting-model.c:703
 #, fuzzy
 msgid "No"
@@ -3407,43 +3409,43 @@ msgstr "cont�"
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/component-factory.c:62 my-evolution/my-evolution.glade.h:6
+#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:6
 #: shell/e-local-storage.c:172 shell/e-shortcuts.c:1056
 msgid "Calendar"
 msgstr "Agenda"
 
-#: calendar/gui/component-factory.c:63
+#: calendar/gui/component-factory.c:64
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/component-factory.c:67 calendar/gui/print.c:1719
-#: my-evolution/e-summary-tasks.c:215 my-evolution/e-summary-tasks.c:231
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1723
+#: my-evolution/e-summary-tasks.c:237 my-evolution/e-summary-tasks.c:253
 #: shell/e-local-storage.c:178 shell/e-shortcuts.c:1059
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Tasques"
 
-#: calendar/gui/component-factory.c:68
+#: calendar/gui/component-factory.c:69
 #, fuzzy
 msgid "Folder containing to-do items"
 msgstr "Filtre sobre la llista de correu"
 
-#: calendar/gui/component-factory.c:593 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:581 ui/evolution-calendar.xml.h:7
 msgid "Create a new appointment"
 msgstr "Crea una nova cita"
 
-#: calendar/gui/component-factory.c:594 calendar/gui/e-day-view.c:3420
+#: calendar/gui/component-factory.c:582 calendar/gui/e-day-view.c:3422
 #, fuzzy
 msgid "New _Appointment"
 msgstr "Nova cita..."
 
-#: calendar/gui/component-factory.c:599 ui/evolution-calendar.xml.h:8
+#: calendar/gui/component-factory.c:587 ui/evolution-calendar.xml.h:8
 #: ui/evolution-tasks.xml.h:5
 #, fuzzy
 msgid "Create a new task"
 msgstr "Crea un nou contacte"
 
-#: calendar/gui/component-factory.c:600
+#: calendar/gui/component-factory.c:588
 #, fuzzy
 msgid "New _Task"
 msgstr "Tasca"
@@ -3526,107 +3528,128 @@ msgstr "hores"
 msgid "minutes"
 msgstr "minuts"
 
-#: calendar/gui/dialogs/alarm-page.c:303
+#: calendar/gui/dialogs/alarm-page.c:307
 #, fuzzy, c-format
 msgid "%d days"
 msgstr "dies"
 
-#: calendar/gui/dialogs/alarm-page.c:305
+#: calendar/gui/dialogs/alarm-page.c:310
 #, fuzzy
 msgid "1 day"
 msgstr "Mostra 1 dia"
 
-#: calendar/gui/dialogs/alarm-page.c:308
+#: calendar/gui/dialogs/alarm-page.c:315
 #, fuzzy, c-format
 msgid "%d weeks"
 msgstr "setmanes"
 
-#: calendar/gui/dialogs/alarm-page.c:310
+#: calendar/gui/dialogs/alarm-page.c:318
 #, fuzzy
 msgid "1 week"
 msgstr "Mostra 1 setmana"
 
-#: calendar/gui/dialogs/alarm-page.c:313
+#: calendar/gui/dialogs/alarm-page.c:323
 #, fuzzy, c-format
 msgid "%d hours"
 msgstr "hores"
 
-#: calendar/gui/dialogs/alarm-page.c:315
+#: calendar/gui/dialogs/alarm-page.c:326
 #, fuzzy
 msgid "1 hour"
 msgstr "hora"
 
-#: calendar/gui/dialogs/alarm-page.c:318
+#: calendar/gui/dialogs/alarm-page.c:331
 #, fuzzy, c-format
 msgid "%d minutes"
 msgstr "minuts"
 
-#: calendar/gui/dialogs/alarm-page.c:320
+#: calendar/gui/dialogs/alarm-page.c:334
 #, fuzzy
 msgid "1 minute"
 msgstr "10 minuts"
 
-#: calendar/gui/dialogs/alarm-page.c:323
+#: calendar/gui/dialogs/alarm-page.c:339
 #, fuzzy, c-format
 msgid "%d seconds"
 msgstr " segons"
 
-#: calendar/gui/dialogs/alarm-page.c:325
+#: calendar/gui/dialogs/alarm-page.c:342
 #, fuzzy
 msgid "1 second"
 msgstr " segons"
 
-#: calendar/gui/dialogs/alarm-page.c:350
+#: calendar/gui/dialogs/alarm-page.c:373
 #: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:354
+#: calendar/gui/dialogs/alarm-page.c:377
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 #, fuzzy
 msgid "Display a message"
 msgstr "Visualitza l'UID del missatge \"%s\""
 
-#: calendar/gui/dialogs/alarm-page.c:358
+#: calendar/gui/dialogs/alarm-page.c:381
 #, fuzzy
 msgid "Send an email"
 msgstr "S'est� recollint el correu des de %s"
 
-#: calendar/gui/dialogs/alarm-page.c:362
+#: calendar/gui/dialogs/alarm-page.c:385
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 #, fuzzy
 msgid "Run a program"
 msgstr "_Executa el programa:"
 
-#: calendar/gui/dialogs/alarm-page.c:368 calendar/gui/dialogs/alarm-page.c:404
-#: calendar/gui/e-meeting-model.c:226 calendar/gui/e-meeting-model.c:261
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:674
-#: calendar/gui/e-meeting-model.c:690
-#: camel/providers/smtp/camel-smtp-transport.c:224
-#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
-msgid "Unknown"
-msgstr "Desconegut"
-
-#: calendar/gui/dialogs/alarm-page.c:380
+#: calendar/gui/dialogs/alarm-page.c:391
 #, fuzzy
-msgid "before start of appointment"
+msgid "Unknown action to be performed"
+msgstr "Error desconegut"
+
+#: calendar/gui/dialogs/alarm-page.c:403
+#, fuzzy, c-format
+msgid "%s %s before the start of the appointment"
 msgstr "Crea una nova cita"
 
-#: calendar/gui/dialogs/alarm-page.c:383
-#, fuzzy
-msgid "after start of appointment"
+#: calendar/gui/dialogs/alarm-page.c:406
+#, fuzzy, c-format
+msgid "%s %s after the start of the appointment"
 msgstr "Crea una nova cita"
 
-#: calendar/gui/dialogs/alarm-page.c:393
-#, fuzzy
-msgid "before end of appointment"
-msgstr "Recorda'm totes les cites"
+#: calendar/gui/dialogs/alarm-page.c:411
+#, fuzzy, c-format
+msgid "%s at the start of the appointment"
+msgstr "Crea una nova cita"
 
-#: calendar/gui/dialogs/alarm-page.c:396
-#, fuzzy
-msgid "after end of appointment"
+#: calendar/gui/dialogs/alarm-page.c:420
+#, fuzzy, c-format
+msgid "%s %s before the end of the appointment"
+msgstr "Crea una nova cita"
+
+#: calendar/gui/dialogs/alarm-page.c:423
+#, fuzzy, c-format
+msgid "%s %s after the end of the appointment"
 msgstr "Crea una nova cita"
 
+#: calendar/gui/dialogs/alarm-page.c:428
+#, fuzzy, c-format
+msgid "%s at the end of the appointment"
+msgstr "Crea una nova cita"
+
+#: calendar/gui/dialogs/alarm-page.c:439
+#, fuzzy, c-format
+msgid "%s at an unknown time"
+msgstr "Error desconegut"
+
+#: calendar/gui/dialogs/alarm-page.c:445
+#, fuzzy, c-format
+msgid "%s at %s"
+msgstr "%2$s%1$s"
+
+#: calendar/gui/dialogs/alarm-page.c:452
+#, c-format
+msgid "%s for an unknown trigger type"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 #, fuzzy
@@ -3986,58 +4009,58 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:159 calendar/gui/print.c:2128
+#: calendar/gui/dialogs/comp-editor-util.c:167 calendar/gui/print.c:2132
 msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:163 calendar/gui/print.c:2132
+#: calendar/gui/dialogs/comp-editor-util.c:171 calendar/gui/print.c:2136
 #, fuzzy
 msgid " (Completed "
 msgstr "% comp_let:"
 
-#: calendar/gui/dialogs/comp-editor-util.c:165 calendar/gui/print.c:2134
+#: calendar/gui/dialogs/comp-editor-util.c:173 calendar/gui/print.c:2138
 #, fuzzy
 msgid "Completed "
 msgstr "% comp_let:"
 
-#: calendar/gui/dialogs/comp-editor-util.c:170 calendar/gui/print.c:2139
+#: calendar/gui/dialogs/comp-editor-util.c:178 calendar/gui/print.c:2143
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2141
+#: calendar/gui/dialogs/comp-editor-util.c:180 calendar/gui/print.c:2145
 #, fuzzy
 msgid "Due "
 msgstr "Data de venciment"
 
-#: calendar/gui/dialogs/comp-editor.c:515
+#: calendar/gui/dialogs/comp-editor.c:521
 msgid "Edit Appointment"
 msgstr "Edita una cita"
 
-#: calendar/gui/dialogs/comp-editor.c:520
+#: calendar/gui/dialogs/comp-editor.c:526
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:523
+#: calendar/gui/dialogs/comp-editor.c:529
 #, c-format
 msgid "Task - %s"
 msgstr "Tasca - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:526
+#: calendar/gui/dialogs/comp-editor.c:532
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada al diari - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:540
+#: calendar/gui/dialogs/comp-editor.c:546
 msgid "No summary"
 msgstr "Sense resum"
 
-#: calendar/gui/dialogs/comp-editor.c:950 mail/mail-callbacks.c:1662
+#: calendar/gui/dialogs/comp-editor.c:952 mail/mail-callbacks.c:1671
 #: mail/mail-display.c:100
 msgid "Overwrite file?"
 msgstr "Voleu sobreescriure el fitxer?"
 
-#: calendar/gui/dialogs/comp-editor.c:954 mail/mail-callbacks.c:1668
+#: calendar/gui/dialogs/comp-editor.c:956 mail/mail-callbacks.c:1677
 #: mail/mail-display.c:104
 msgid ""
 "A file by that name already exists.\n"
@@ -4046,73 +4069,73 @@ msgstr ""
 "Ja existeix una fitxer amb aquest nom.\n"
 "El voleu sobreescriure?"
 
-#: calendar/gui/dialogs/comp-editor.c:1017 ui/evolution-comp-editor.xml.h:13
+#: calendar/gui/dialogs/comp-editor.c:1019 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 #, fuzzy
 msgid "Save As..."
 msgstr "Anomena i desa..."
 
-#: calendar/gui/dialogs/comp-editor.c:1170
+#: calendar/gui/dialogs/comp-editor.c:1172
 msgid "Unable to obtain current version!"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:90
+#: calendar/gui/dialogs/delete-comp.c:91
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/delete-comp.c:93
+#: calendar/gui/dialogs/delete-comp.c:94
 #, fuzzy
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:100
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/delete-comp.c:102
+#: calendar/gui/dialogs/delete-comp.c:103
 #, fuzzy
 msgid "Are you sure you want to delete this untitled task?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:109
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/delete-comp.c:111
+#: calendar/gui/dialogs/delete-comp.c:112
 #, fuzzy
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/delete-comp.c:126
+#: calendar/gui/dialogs/delete-comp.c:127
 #, fuzzy, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/delete-comp.c:131
+#: calendar/gui/dialogs/delete-comp.c:132
 #, fuzzy, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/delete-comp.c:136
+#: calendar/gui/dialogs/delete-comp.c:137
 #, fuzzy, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr ""
@@ -4321,7 +4344,7 @@ msgstr "_Estat:"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:18
-#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:85
+#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:86
 #: shell/glade/e-active-connection-dialog.glade.h:5
 #, fuzzy
 msgid "Type"
@@ -4348,8 +4371,8 @@ msgstr "_Invita a altres..."
 msgid "_Other Organizer"
 msgstr "Organitzaci�:"
 
-#: calendar/gui/dialogs/recurrence-page.c:422 calendar/gui/print.c:1851
-#: calendar/gui/print.c:1853 calendar/gui/print.c:1854
+#: calendar/gui/dialogs/recurrence-page.c:422 calendar/gui/print.c:1855
+#: calendar/gui/print.c:1857 calendar/gui/print.c:1858
 msgid "%a %b %d %Y"
 msgstr "%a, %d de %b de %Y"
 
@@ -4478,7 +4501,7 @@ msgid "Progress"
 msgstr "En proc�s"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:910
+#: my-evolution/e-summary-preferences.c:949
 #, fuzzy
 msgid "URL:"
 msgstr "URL:"
@@ -4499,7 +4522,7 @@ msgstr "Assigna una puntuaci�"
 
 #: calendar/gui/dialogs/task-page.glade.h:4
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:28
 msgid "Description:"
 msgstr "Descripci�:"
 
@@ -4516,113 +4539,113 @@ msgstr "_Confidencial"
 msgid "_Due Date:"
 msgstr "_Data de venciment:"
 
-#: calendar/gui/e-calendar-table.c:350
+#: calendar/gui/e-calendar-table.c:407
 #, c-format
 msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:351
+#: calendar/gui/e-calendar-table.c:408
 #, c-format
 msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:409
 #, c-format
 msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:410
 #, c-format
 msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:411
 #, c-format
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:412
 #, c-format
 msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:356
+#: calendar/gui/e-calendar-table.c:413
 #, c-format
 msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:357
+#: calendar/gui/e-calendar-table.c:414
 #, c-format
 msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:358
+#: calendar/gui/e-calendar-table.c:415
 #, c-format
 msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:359
+#: calendar/gui/e-calendar-table.c:416
 #, c-format
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:360
+#: calendar/gui/e-calendar-table.c:417
 #, c-format
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3441
-#: calendar/gui/e-week-view.c:3288 mail/folder-browser.c:1336
+#: calendar/gui/e-calendar-table.c:914 calendar/gui/e-day-view.c:3443
+#: calendar/gui/e-week-view.c:3296 mail/folder-browser.c:1371
 #: shell/e-shortcuts-view.c:385
 #, fuzzy
 msgid "_Open"
 msgstr "_Obre"
 
-#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3450
-#: calendar/gui/e-week-view.c:3297 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:918 calendar/gui/e-day-view.c:3452
+#: calendar/gui/e-week-view.c:3305 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:856 calendar/gui/e-day-view.c:3452
-#: calendar/gui/e-week-view.c:3299 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:920 calendar/gui/e-day-view.c:3454
+#: calendar/gui/e-week-view.c:3307 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:14
 #, fuzzy
 msgid "_Copy"
 msgstr "Copia"
 
-#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3427
-#: calendar/gui/e-day-view.c:3454 calendar/gui/e-week-view.c:3275
-#: calendar/gui/e-week-view.c:3301 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:922 calendar/gui/e-day-view.c:3429
+#: calendar/gui/e-day-view.c:3456 calendar/gui/e-week-view.c:3283
+#: calendar/gui/e-week-view.c:3309 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:40 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:17
 #, fuzzy
 msgid "_Paste"
 msgstr "Enganxa"
 
-#: calendar/gui/e-calendar-table.c:863
+#: calendar/gui/e-calendar-table.c:927
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "Marca com a completa"
 
-#: calendar/gui/e-calendar-table.c:865
+#: calendar/gui/e-calendar-table.c:929
 #, fuzzy
 msgid "_Delete this Task"
 msgstr "Suprimeix la tasca"
 
-#: calendar/gui/e-calendar-table.c:868
+#: calendar/gui/e-calendar-table.c:932
 #, fuzzy
 msgid "_Mark Tasks as Complete"
 msgstr "Marca com a completa"
 
-#: calendar/gui/e-calendar-table.c:870
+#: calendar/gui/e-calendar-table.c:934
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Suprimeix la tasca"
 
-#: calendar/gui/e-calendar-table.c:1130
+#: calendar/gui/e-calendar-table.c:1194
 #: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Click to add a task"
@@ -4632,8 +4655,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:702
-#: camel/camel-filter-driver.c:819
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:718
+#: camel/camel-filter-driver.c:834
 #, fuzzy
 msgid "Complete"
 msgstr "% comp_let:"
@@ -4668,8 +4691,8 @@ 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:30 shell/e-shortcuts.c:1050
-#: shell/e-storage-set-view.c:1424 shell/e-summary-storage.c:80
+#: my-evolution/component-factory.c:45 shell/e-shortcuts.c:1050
+#: shell/e-storage-set-view.c:1420 shell/e-summary-storage.c:80
 #, fuzzy
 msgid "Summary"
 msgstr "R_esum"
@@ -4692,7 +4715,7 @@ 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:285 calendar/gui/e-day-view.c:1374
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1458
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
 msgid "%A %d %B"
 msgstr "%A, %d de %B"
 
@@ -4704,301 +4727,318 @@ 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:608 calendar/gui/e-week-view.c:344
-#: calendar/gui/print.c:765
+#: calendar/gui/e-day-view.c:608 calendar/gui/e-week-view.c:345
+#: calendar/gui/print.c:769
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:347
-#: calendar/gui/print.c:767
+#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:348
+#: calendar/gui/print.c:771
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3422 calendar/gui/e-week-view.c:3270
+#: calendar/gui/e-day-view.c:3424 calendar/gui/e-week-view.c:3278
 #, fuzzy
 msgid "New All Day _Event"
 msgstr "Esdeveniment per a _tot el dia"
 
-#: calendar/gui/e-day-view.c:3432 calendar/gui/e-week-view.c:3280
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3288
 #: ui/evolution-calendar.xml.h:17
 #, fuzzy
 msgid "Go to _Today"
 msgstr "V�s a avui"
 
-#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3282
+#: calendar/gui/e-day-view.c:3436 calendar/gui/e-week-view.c:3290
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "V�s a una data"
 
-#: calendar/gui/e-day-view.c:3443 calendar/gui/e-week-view.c:3290
+#: calendar/gui/e-day-view.c:3445 calendar/gui/e-week-view.c:3298
 #, fuzzy
 msgid "_Delete this Appointment"
 msgstr "Suprimeix aquesta cita"
 
-#: calendar/gui/e-day-view.c:3462 calendar/gui/e-week-view.c:3315
+#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3323
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "Fes aquesta cita movible"
 
-#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3317
+#: calendar/gui/e-day-view.c:3466 calendar/gui/e-week-view.c:3325
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "Suprimeix-ne aquesta aparici�"
 
-#: calendar/gui/e-day-view.c:3466 calendar/gui/e-week-view.c:3319
+#: calendar/gui/e-day-view.c:3468 calendar/gui/e-week-view.c:3327
 #, fuzzy
 msgid "Delete _All Occurrences"
 msgstr "Suprimeix-ne totes les aparicions"
 
+#: calendar/gui/e-itip-control.c:469
+msgid "Meeting begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:474
+msgid "Task begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:479
+#, fuzzy
+msgid "Free/Busy info begins: <b>"
+msgstr "Cap informaci�"
+
+#: calendar/gui/e-itip-control.c:483
+msgid "Begins: <b>"
+msgstr ""
+
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:677
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:664
+#: calendar/gui/e-itip-control.c:692
 #, c-format
 msgid "<b>Summary:</b> %s<br><br>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:664
+#: calendar/gui/e-itip-control.c:692
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:674
+#: calendar/gui/e-itip-control.c:702
 #, fuzzy, c-format
 msgid "<b>Description:</b> %s"
 msgstr "Descripci�:"
 
-#: calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:737
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:738
 #, fuzzy
 msgid "Meeting Information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-itip-control.c:715
+#: calendar/gui/e-itip-control.c:742
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:716
+#: calendar/gui/e-itip-control.c:743
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "Cancel�lat"
 
-#: calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-itip-control.c:747
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:721
+#: calendar/gui/e-itip-control.c:748
 #, fuzzy
 msgid "Meeting Update"
 msgstr "Hora de _finalitzaci� de la reuni�:"
 
-#: calendar/gui/e-itip-control.c:725
+#: calendar/gui/e-itip-control.c:752
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:726
+#: calendar/gui/e-itip-control.c:753
 #, fuzzy
 msgid "Meeting Update Request"
 msgstr "FIXME: Pe_tici� de cita"
 
-#: calendar/gui/e-itip-control.c:730
+#: calendar/gui/e-itip-control.c:757
 #, 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:731
+#: calendar/gui/e-itip-control.c:758
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "Cancel�lat"
 
-#: calendar/gui/e-itip-control.c:735
+#: calendar/gui/e-itip-control.c:762
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:736
+#: calendar/gui/e-itip-control.c:763
 #, fuzzy
 msgid "Meeting Cancellation"
 msgstr "Fitxer de signatura:"
 
-#: calendar/gui/e-itip-control.c:740 calendar/gui/e-itip-control.c:788
-#: calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:767 calendar/gui/e-itip-control.c:815
+#: calendar/gui/e-itip-control.c:848
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:741
+#: calendar/gui/e-itip-control.c:768
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "_Edita el missatge"
 
-#: calendar/gui/e-itip-control.c:758
+#: calendar/gui/e-itip-control.c:785
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:759
+#: calendar/gui/e-itip-control.c:786
 #, fuzzy
 msgid "Task Information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-itip-control.c:763
+#: calendar/gui/e-itip-control.c:790
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:791
 #, fuzzy
 msgid "Task Proposal"
 msgstr "TaskPad"
 
-#: calendar/gui/e-itip-control.c:768
+#: calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:769
+#: calendar/gui/e-itip-control.c:796
 #, fuzzy
 msgid "Task Update"
 msgstr "ha estat despr�s de"
 
-#: calendar/gui/e-itip-control.c:773
+#: calendar/gui/e-itip-control.c:800
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:774
+#: calendar/gui/e-itip-control.c:801
 #, fuzzy
 msgid "Task Update Request"
 msgstr "FIXME: _Petici� de tasca"
 
-#: calendar/gui/e-itip-control.c:778
+#: calendar/gui/e-itip-control.c:805
 #, 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:779
+#: calendar/gui/e-itip-control.c:806
 #, fuzzy
 msgid "Task Reply"
 msgstr "Respon"
 
-#: calendar/gui/e-itip-control.c:783
+#: calendar/gui/e-itip-control.c:810
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:784
+#: calendar/gui/e-itip-control.c:811
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "Cancel�lat"
 
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:816
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "Agenda"
 
-#: calendar/gui/e-itip-control.c:806
+#: calendar/gui/e-itip-control.c:833
 #, fuzzy, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-itip-control.c:807
+#: calendar/gui/e-itip-control.c:834
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-itip-control.c:811
+#: calendar/gui/e-itip-control.c:838
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:812
+#: calendar/gui/e-itip-control.c:839
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:816
+#: calendar/gui/e-itip-control.c:843
 #, 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:817
+#: calendar/gui/e-itip-control.c:844
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:822
+#: calendar/gui/e-itip-control.c:849
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "Imprimeix el missatge"
 
-#: calendar/gui/e-itip-control.c:889
+#: calendar/gui/e-itip-control.c:916
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:908
+#: calendar/gui/e-itip-control.c:935
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:936 calendar/gui/e-itip-control.c:942
+#: calendar/gui/e-itip-control.c:963 calendar/gui/e-itip-control.c:969
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1088
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1063
+#: calendar/gui/e-itip-control.c:1090
 #, fuzzy
 msgid "Update complete\n"
 msgstr "Data completa:"
 
-#: calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.c:1134
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1142
 msgid "Attendee status ould not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1144
 #, fuzzy
 msgid "Attendee status updated\n"
 msgstr "Tots els assistents"
 
-#: calendar/gui/e-itip-control.c:1119
+#: calendar/gui/e-itip-control.c:1146
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1174
 #, fuzzy
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "No s'ha pogut crear una agenda a `%s'"
 
-#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-itip-control.c:1176
 #, fuzzy
 msgid "Removal Complete"
 msgstr "% comp_let:"
 
-#: calendar/gui/e-itip-control.c:1181 calendar/gui/e-itip-control.c:1216
+#: calendar/gui/e-itip-control.c:1208 calendar/gui/e-itip-control.c:1242
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "Data d'enviament"
 
-#: calendar/gui/e-itip-control.c:1183 calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1210 calendar/gui/e-itip-control.c:1246
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1380
+#: calendar/gui/e-itip-control.c:1406
 msgid "Unable to find any of your identities in the attendees list!\n"
 msgstr ""
 
@@ -5067,6 +5107,14 @@ msgstr "Font"
 msgid "Room"
 msgstr ""
 
+#: calendar/gui/e-meeting-model.c:226 calendar/gui/e-meeting-model.c:261
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:674
+#: calendar/gui/e-meeting-model.c:690
+#: camel/providers/smtp/camel-smtp-transport.c:224
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
+msgid "Unknown"
+msgstr "Desconegut"
+
 #: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
 #: calendar/gui/e-meeting-model.c:686
 #, fuzzy
@@ -5126,14 +5174,14 @@ msgstr "En proc�s"
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:472
-#: calendar/gui/e-meeting-time-sel.c:1936
+#: calendar/gui/e-meeting-time-sel.c:1937
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:476
-#: calendar/gui/e-meeting-time-sel.c:1964 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:1965 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:345
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
@@ -5141,7 +5189,7 @@ msgstr "%a %d/%m/%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:480 e-util/e-time-utils.c:221
-#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1552
+#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1577
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
@@ -5219,19 +5267,19 @@ msgstr "No s'ha pogut carregar l'agenda en `%s'"
 msgid "The method required to load `%s' is not supported"
 msgstr "El m�tode necessari per carregar `%s' no est� suportat"
 
-#: calendar/gui/e-week-view.c:3268 calendar/gui/e-week-view.c:3306
+#: calendar/gui/e-week-view.c:3276 calendar/gui/e-week-view.c:3314
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "Nova cita..."
 
-#: calendar/gui/gnome-cal.c:1318
+#: calendar/gui/gnome-cal.c:1319
 #, fuzzy, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 "No s'ha pogut obrir la carpeta `%s':\n"
 "%s"
 
-#: calendar/gui/gnome-cal.c:1329
+#: calendar/gui/gnome-cal.c:1330
 #, fuzzy, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "El m�tode necessari per carregar `%s' no est� suportat"
@@ -5315,205 +5363,205 @@ msgstr ""
 msgid "Could not create the component editor factory"
 msgstr "No s'ha pogut crear el directori temporal: %s"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "1st"
 msgstr "1"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "2nd"
 msgstr "2"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "3rd"
 msgstr "3"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "4th"
 msgstr "4"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "5th"
 msgstr "5"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "6th"
 msgstr "6"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "7th"
 msgstr "7"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "8th"
 msgstr "8"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "9th"
 msgstr "9"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "10th"
 msgstr "10"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "11th"
 msgstr "11"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "12th"
 msgstr "12"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "13th"
 msgstr "13"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "14th"
 msgstr "14"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "15th"
 msgstr "15"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "16th"
 msgstr "16"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "17th"
 msgstr "17"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "18th"
 msgstr "18"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "19th"
 msgstr "19"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "20th"
 msgstr "20"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "21st"
 msgstr "21"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "22nd"
 msgstr "22"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "23rd"
 msgstr "23"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "24th"
 msgstr "24"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "25th"
 msgstr "25"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "26th"
 msgstr "26"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "27th"
 msgstr "27"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "28th"
 msgstr "28"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "29th"
 msgstr "29"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "30th"
 msgstr "30"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:432
 msgid "31st"
 msgstr "31"
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "Su"
 msgstr "Dg"
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "Mo"
 msgstr "Dl"
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "Tu"
 msgstr "Dm"
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "We"
 msgstr "Dc"
 
-#: calendar/gui/print.c:497
+#: calendar/gui/print.c:500
 msgid "Th"
 msgstr "Dj"
 
-#: calendar/gui/print.c:497
+#: calendar/gui/print.c:500
 msgid "Fr"
 msgstr "Dv"
 
-#: calendar/gui/print.c:497
+#: calendar/gui/print.c:500
 msgid "Sa"
 msgstr "Ds"
 
 #. Day
-#: calendar/gui/print.c:1827
+#: calendar/gui/print.c:1831
 #, fuzzy
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Avui (%a, %d de %b de %Y)"
 
-#: calendar/gui/print.c:1846 calendar/gui/print.c:1850
+#: calendar/gui/print.c:1850 calendar/gui/print.c:1854
 msgid "%a %b %d"
 msgstr "%a, %d de %b"
 
-#: calendar/gui/print.c:1847
+#: calendar/gui/print.c:1851
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1858
+#: calendar/gui/print.c:1862
 #, fuzzy, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Aquesta setmana (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1866
+#: calendar/gui/print.c:1870
 #, fuzzy
 msgid "Selected month (%b %Y)"
 msgstr "Aquest mes (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1873
+#: calendar/gui/print.c:1877
 #, fuzzy
 msgid "Selected year (%Y)"
 msgstr "Enguany (%Y)"
 
-#: calendar/gui/print.c:2214
+#: calendar/gui/print.c:2221
 msgid "Print Calendar"
 msgstr "Imprimeix l'agenda"
 
-#: calendar/gui/print.c:2302 calendar/gui/print.c:2394
-#: mail/mail-callbacks.c:2071 my-evolution/e-summary.c:551
+#: calendar/gui/print.c:2312 calendar/gui/print.c:2404
+#: mail/mail-callbacks.c:2080 my-evolution/e-summary.c:607
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
 msgstr "Previsualitzaci� d'impressi�"
 
-#: calendar/gui/print.c:2331
+#: calendar/gui/print.c:2341
 #, fuzzy
 msgid "Print Item"
 msgstr "Imprimeix aquest element"
 
-#: calendar/gui/print.c:2412
+#: calendar/gui/print.c:2422
 #, fuzzy
 msgid "Print Setup"
 msgstr "Configuraci� de la p�gina:"
@@ -5705,70 +5753,87 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr ""
 
-#: camel/camel-disco-store.c:305
+#: camel/camel-disco-store.c:336
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
+#: camel/camel-filter-driver.c:549 camel/camel-filter-driver.c:558
 #, fuzzy
 msgid "Syncing folders"
 msgstr "S'est� sincronitzant \"%s\""
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:659
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "No es pot obrir la llibreta d'adreces"
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:668
 #, 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:667
+#: camel/camel-filter-driver.c:683
 #, fuzzy, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "S'est� escrivint el missatge %d de %d"
 
-#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
+#: camel/camel-filter-driver.c:687 camel/camel-filter-driver.c:700
 #, fuzzy, c-format
 msgid "Failed on message %d"
 msgstr "Missatge de _correu (FIXME)"
 
-#: camel/camel-filter-driver.c:672
+#: camel/camel-filter-driver.c:688
 #, fuzzy
 msgid "Cannot open message"
 msgstr "No es pot recuperar el missatge: %s"
 
-#: camel/camel-filter-driver.c:698 camel/camel-filter-driver.c:814
+#: camel/camel-filter-driver.c:714 camel/camel-filter-driver.c:829
 #, fuzzy
 msgid "Syncing folder"
 msgstr "S'est� sincronitzant \"%s\""
 
-#: camel/camel-filter-driver.c:770
+#: camel/camel-filter-driver.c:786
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "S'est� escrivint el missatge %d de %d"
 
-#: camel/camel-filter-driver.c:775 camel/camel-filter-driver.c:793
+#: camel/camel-filter-driver.c:791 camel/camel-filter-driver.c:809
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "S'est� escrivint el missatge %d de %d"
 
-#: camel/camel-filter-driver.c:900
+#: camel/camel-filter-driver.c:918
 #, fuzzy, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: camel/camel-filter-driver.c:906
+#: camel/camel-filter-driver.c:924
 #, fuzzy, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: camel/camel-filter-search.c:479 camel/camel-filter-search.c:486
+#: camel/camel-filter-search.c:494 camel/camel-filter-search.c:501
 #, fuzzy, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Error en desar el fitxer: %s"
 
+#: camel/camel-folder.c:472
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1039
+#, fuzzy, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr ""
+"Error en preparar-se per a %s:\n"
+"%s"
+
+#: camel/camel-folder.c:1219
+#, fuzzy
+msgid "Moving messages"
+msgstr "C�pia de missatges"
+
 #: camel/camel-folder-search.c:333
 #, fuzzy, c-format
 msgid ""
@@ -5796,7 +5861,7 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:747 camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:748 camel/camel-folder-search.c:792
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
@@ -5897,76 +5962,76 @@ 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-pgp-context.c:193
+#: camel/camel-pgp-context.c:191
 #, fuzzy, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Si us plau, introdu�u la vostra contrasenya PGP/GPG."
 
-#: camel/camel-pgp-context.c:196
+#: camel/camel-pgp-context.c:194
 #, fuzzy, c-format
 msgid "Please enter your %s passphrase"
 msgstr "Si us plau, introdu�u la vostra contrasenya PGP/GPG."
 
-#: camel/camel-pgp-context.c:518
+#: camel/camel-pgp-context.c:525
 #, fuzzy
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr ""
 "No es pot recuperar el missatge: %s\n"
 "  %s"
 
-#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:532 camel/camel-pgp-context.c:706
 msgid "Cannot sign this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:538 camel/camel-pgp-context.c:712
 #, fuzzy, c-format
 msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "No s'ha pogut crear cap conducte a GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:693
+#: camel/camel-pgp-context.c:699
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr ""
 
-#: camel/camel-pgp-context.c:886
+#: camel/camel-pgp-context.c:891
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr ""
 
-#: camel/camel-pgp-context.c:892
+#: camel/camel-pgp-context.c:897
 #, fuzzy, c-format
 msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "No s'ha pogut crear cap conducte a GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:903
+#: camel/camel-pgp-context.c:908
 #, fuzzy, c-format
 msgid "Cannot verify this message: couldn't create temp file: %s"
 msgstr "No s'ha pogut crear el conducte: %s"
 
-#: camel/camel-pgp-context.c:1069
+#: camel/camel-pgp-context.c:1076
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1079
+#: camel/camel-pgp-context.c:1086
 msgid "Cannot encrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1086
+#: camel/camel-pgp-context.c:1093
 #, fuzzy, c-format
 msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "No s'ha pogut crear cap conducte a GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:1095
+#: camel/camel-pgp-context.c:1102
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1258
+#: camel/camel-pgp-context.c:1264
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1266
+#: camel/camel-pgp-context.c:1272
 msgid "Cannot decrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1273
+#: camel/camel-pgp-context.c:1279
 #, fuzzy, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "No s'ha pogut crear cap conducte a GPG/PGP: %s"
@@ -6012,14 +6077,14 @@ msgstr "No s'ha pogut connectar a %s (port %d): %s"
 msgid "(unknown host)"
 msgstr "(ordinador central desconegut)"
 
-#: camel/camel-remote-store.c:361 camel/camel-remote-store.c:423
-#: camel/camel-remote-store.c:486
+#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
+#: camel/camel-remote-store.c:483
 #: camel/providers/imap/camel-imap-command.c:386
 #, fuzzy
 msgid "Operation cancelled"
 msgstr "Obre l'agenda"
 
-#: camel/camel-remote-store.c:489
+#: camel/camel-remote-store.c:486
 #, fuzzy, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "El servidor ha rebutjat el nom d'usuari"
@@ -6136,7 +6201,7 @@ msgid ""
 msgstr "No s'ha pogut crear el conducte: %s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:492
+#: camel/providers/imap/camel-imap-store.c:494
 #, fuzzy
 msgid "Bad authentication response from server."
 msgstr "Resposta inesperada del servidor IMAP: %s"
@@ -6159,7 +6224,7 @@ msgstr "Autenticaci�:"
 
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:302
-#: camel/providers/pop3/camel-pop3-provider.c:68 mail/mail-config.glade.h:54
+#: camel/providers/pop3/camel-pop3-provider.c:68 mail/mail-config.glade.h:55
 msgid "Password"
 msgstr "Contrasenya"
 
@@ -6189,37 +6254,37 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Error en escriure a la b�stia de correu temporal: %s"
 
-#: camel/camel-service.c:154
+#: camel/camel-service.c:157
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "L'URL '%s' necessita un component de nom d'usuari"
 
-#: camel/camel-service.c:162
+#: camel/camel-service.c:165
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "L'URL '%s' necessita un component d'ordinador central"
 
-#: camel/camel-service.c:170
+#: camel/camel-service.c:173
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "L'URL '%s' necessita un component de cam�"
 
-#: camel/camel-service.c:548
+#: camel/camel-service.c:602
 #, fuzzy, c-format
 msgid "Resolving: %s"
 msgstr "S'est� comprovant \"%s\""
 
-#: camel/camel-service.c:575
+#: camel/camel-service.c:629
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:600
+#: camel/camel-service.c:654
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:602
+#: camel/camel-service.c:656
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
@@ -6232,12 +6297,12 @@ msgstr "Prove�dor de correu de la carpeta virtual"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Per llegir correu com a consulta d'un altre joc de carpetes"
 
-#: camel/camel-session.c:322 camel/camel-session.c:391
+#: camel/camel-session.c:324 camel/camel-session.c:393
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "No hi ha cap prove�dor disponible per al protocol `%s'"
 
-#: camel/camel-session.c:508
+#: camel/camel-session.c:510
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -6289,7 +6354,7 @@ msgstr ""
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/camel-tcp-stream-openssl.c:463
+#: camel/camel-tcp-stream-openssl.c:491
 #, fuzzy, c-format
 msgid ""
 "Issuer: %s\n"
@@ -6297,7 +6362,7 @@ msgid ""
 msgstr "Assumpte"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:369
+#: camel/camel-tcp-stream-openssl.c:496 camel/camel-tcp-stream-ssl.c:369
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -6326,17 +6391,37 @@ msgstr ""
 "No s'ha pogut obrir el fitxer `%s':\n"
 "%s"
 
-#: camel/camel-vee-folder.c:546
+#: camel/camel-vee-folder.c:554
 #, fuzzy, c-format
 msgid "No such message %s in %s"
 msgstr "L'ordinador central %s no existeix."
 
-#: camel/camel-vee-folder.c:641
+#: camel/camel-vee-folder.c:649
 #, fuzzy, c-format
 msgid "No such message: %s"
 msgstr "L'ordinador central %s no existeix."
 
-#: camel/camel-vtrash-folder.c:106
+#: camel/camel-vee-store.c:250
+#, fuzzy, c-format
+msgid "Cannot delete folder: %s: Invalid operation"
+msgstr "No es pot bifurcar %s: %s"
+
+#: camel/camel-vee-store.c:286
+#, fuzzy, c-format
+msgid "Cannot delete folder: %s: No such folder"
+msgstr "No es pot bifurcar %s: %s"
+
+#: camel/camel-vee-store.c:298
+#, fuzzy, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "No es pot bifurcar %s: %s"
+
+#: camel/camel-vee-store.c:326
+#, fuzzy, c-format
+msgid "Cannot rename folder: %s: No such folder"
+msgstr "No es pot bifurcar %s: %s"
+
+#: camel/camel-vtrash-folder.c:109
 #, fuzzy
 msgid "You cannot copy messages from this trash folder."
 msgstr ""
@@ -6389,7 +6474,7 @@ msgid "Scanning for changed messages"
 msgstr "S'estan desant els canvis al missatge..."
 
 #: camel/providers/imap/camel-imap-folder.c:1491
-#: camel/providers/imap/camel-imap-folder.c:1890
+#: camel/providers/imap/camel-imap-folder.c:1899
 #, fuzzy
 msgid "This message is not currently available"
 msgstr ""
@@ -6406,7 +6491,7 @@ msgstr ""
 msgid "Scanning for new messages"
 msgstr "C�pia de missatges"
 
-#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/imap/camel-imap-folder.c:1936
 msgid "Could not find message body in FETCH response."
 msgstr "No s'ha pogut trobar el cos del missatge en la resposta al FETCH."
 
@@ -6423,7 +6508,7 @@ msgstr "No s'ha pogut crear el directori %s: %s"
 msgid "Failed to cache message %s: %s"
 msgstr "Missatge de _correu (FIXME)"
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:14
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Checking for new mail"
 msgstr "Comprova si hi ha nou correu"
@@ -6433,7 +6518,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:733
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:767
 msgid "Folders"
 msgstr "Carpetes"
 
@@ -6470,30 +6555,30 @@ msgstr ""
 "Aquesta opci� es connectar� al servidor IMAP mitjan�ant una contrasenya de "
 "text net."
 
-#: camel/providers/imap/camel-imap-store.c:515
+#: camel/providers/imap/camel-imap-store.c:517
 #, 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:525
+#: camel/providers/imap/camel-imap-store.c:527
 #: camel/providers/smtp/camel-smtp-transport.c:388
 #, fuzzy, c-format
 msgid "No support for authentication type %s"
 msgstr "Autenticaci�:"
 
-#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap/camel-imap-store.c:551
 #, 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:564
+#: camel/providers/imap/camel-imap-store.c:566
 #: camel/providers/smtp/camel-smtp-transport.c:432
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:590
+#: camel/providers/imap/camel-imap-store.c:592
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6504,12 +6589,12 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:889
+#: camel/providers/imap/camel-imap-store.c:891
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "La carpeta `%s' no existeix."
 
-#: camel/providers/imap/camel-imap-store.c:1090
+#: camel/providers/imap/camel-imap-store.c:1131
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -6547,52 +6632,52 @@ msgstr ""
 msgid "For storing local mail in qmail maildir directories."
 msgstr "Per emmagatzemar correu local en directoris de correu de tipus MH"
 
-#: camel/providers/local/camel-local-provider.c:77
+#: camel/providers/local/camel-local-provider.c:78
 msgid "Standard Unix mbox spools"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:78
+#: camel/providers/local/camel-local-provider.c:79
 #, fuzzy
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr "Per emmagatzemar correu local en directoris de correu de tipus MH"
 
-#: camel/providers/local/camel-local-store.c:127
-#: camel/providers/local/camel-spool-store.c:112
+#: camel/providers/local/camel-local-store.c:132
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:134
+#: camel/providers/local/camel-local-store.c:139
 #, fuzzy, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "`%s' no �s un fitxer habitual."
 
-#: camel/providers/local/camel-local-store.c:142
-#: camel/providers/local/camel-local-store.c:158
+#: camel/providers/local/camel-local-store.c:147
+#: camel/providers/local/camel-local-store.c:163
 #, fuzzy, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/providers/local/camel-local-store.c:173
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:183
+#: camel/providers/local/camel-local-store.c:190
 #, c-format
 msgid "Local mail file %s"
 msgstr "Fitxer de correu local %s"
 
-#: camel/providers/local/camel-local-store.c:240
+#: camel/providers/local/camel-local-store.c:247
 #, 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:282
+#: camel/providers/local/camel-local-store.c:289
 #, 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:292
+#: camel/providers/local/camel-local-store.c:299
 #, fuzzy, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "No s'ha pogut suprimir la carpeta `%s': %s"
@@ -6885,27 +6970,27 @@ msgstr "No es pot obrir la b�stia de correu temporal: %s"
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "No es pot afegir el missatge al fitxer mbox: %s"
 
-#: camel/providers/local/camel-spool-store.c:133
+#: camel/providers/local/camel-spool-store.c:116
 #, fuzzy, c-format
 msgid "Spool `%s' does not exist or is not a regular file"
 msgstr "`%s' no �s un fitxer habitual."
 
-#: camel/providers/local/camel-spool-store.c:159
+#: camel/providers/local/camel-spool-store.c:142
 #, fuzzy, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "La carpeta `%s' no existeix."
 
-#: camel/providers/local/camel-spool-store.c:181
+#: camel/providers/local/camel-spool-store.c:164
 #, fuzzy, c-format
 msgid "Spool mail file %s"
 msgstr "Fitxer de correu local %s"
 
-#: camel/providers/local/camel-spool-store.c:227
+#: camel/providers/local/camel-spool-store.c:210
 #, fuzzy
 msgid "Spool folders cannot be renamed"
 msgstr "Les carpetes Mbox no es poden imbricar."
 
-#: camel/providers/local/camel-spool-store.c:235
+#: camel/providers/local/camel-spool-store.c:218
 #, fuzzy
 msgid "Spool folders cannot be deleted"
 msgstr "Les carpetes Mbox no es poden imbricar."
@@ -7032,31 +7117,31 @@ msgstr "S'estan recuperant els missatges : %s"
 msgid "Could not check POP server for new messages: %s"
 msgstr "No s'ha pogut connectar al servidor POP en %s."
 
-#: camel/providers/pop3/camel-pop3-folder.c:235
+#: camel/providers/pop3/camel-pop3-folder.c:242
 msgid "Could not open folder: message listing was incomplete."
 msgstr "No s'ha pogut obrir la carpeta: la llista de missatges era incompleta."
 
-#: camel/providers/pop3/camel-pop3-folder.c:259
+#: camel/providers/pop3/camel-pop3-folder.c:266
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: camel/providers/pop3/camel-pop3-folder.c:335
+#: camel/providers/pop3/camel-pop3-folder.c:342
 #, fuzzy, c-format
 msgid "Could not fetch message: %s"
 msgstr "No s'ha pogut enviar el missatge: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:351
+#: camel/providers/pop3/camel-pop3-folder.c:358
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "No s'ha pogut recuperar el missatge %s del servidor POP: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:374
+#: camel/providers/pop3/camel-pop3-folder.c:381
 #, c-format
 msgid "No message with uid %s"
 msgstr "No hi ha cap missatge amb l'uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:378
+#: camel/providers/pop3/camel-pop3-folder.c:385
 #, fuzzy, c-format
 msgid "Retrieving POP message %d"
 msgstr "S'estan recuperant els missatges : %s"
@@ -7076,7 +7161,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:51 mail/mail-config.glade.h:53
+#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:54
 msgid "POP"
 msgstr "POP"
 
@@ -7172,7 +7257,7 @@ msgid "Unexpected response from POP server: %s"
 msgstr "Resposta inesperada del servidor IMAP: %s"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:73
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -7228,7 +7313,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Lliurament de correu mitjan�ant el programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:66
 msgid "SMTP"
 msgstr ""
 
@@ -7875,13 +7960,13 @@ msgstr "%H:%M:%S%n"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:309 e-util/e-time-utils.c:396
-#: widgets/misc/e-dateedit.c:1360 widgets/misc/e-dateedit.c:1587
+#: widgets/misc/e-dateedit.c:1385 widgets/misc/e-dateedit.c:1612
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:313 e-util/e-time-utils.c:388
-#: widgets/misc/e-dateedit.c:1357 widgets/misc/e-dateedit.c:1584
+#: widgets/misc/e-dateedit.c:1382 widgets/misc/e-dateedit.c:1609
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -8032,8 +8117,8 @@ msgid ""
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:232 filter/vfolder-rule.c:351
-#: mail/mail-account-gui.c:820
+#: filter/filter-folder.c:232 filter/vfolder-rule.c:356
+#: mail/mail-account-gui.c:822
 msgid "Select Folder"
 msgstr "Seleccioneu una carpeta"
 
@@ -8304,7 +8389,7 @@ msgstr "Respon a tots"
 msgid "Score"
 msgstr "Puntuaci�"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1242
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1251
 msgid "Sender"
 msgstr "Remitent"
 
@@ -8339,7 +8424,7 @@ msgstr "comen�a per"
 msgid "Stop Processing"
 msgstr "Atura el processament"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:893
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:917
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Assumpte"
@@ -8371,7 +8456,7 @@ msgstr "Filtres d'edici�"
 msgid "Score Rules"
 msgstr "Edita la regla de puntuaci�"
 
-#: filter/vfolder-rule.c:203
+#: filter/vfolder-rule.c:206
 msgid "Oops.  You need to to specify at least one folder as a source."
 msgstr ""
 
@@ -8391,19 +8476,19 @@ msgstr "S'est� movent"
 msgid "Please wait"
 msgstr "acaba amb"
 
-#: importers/elm-importer.c:171 importers/netscape-importer.c:701
+#: importers/elm-importer.c:171 importers/netscape-importer.c:708
 #: importers/pine-importer.c:369
 #, fuzzy, c-format
 msgid "Importing %s as %s"
 msgstr "S'est� movent"
 
-#: importers/elm-importer.c:377 importers/netscape-importer.c:794
+#: importers/elm-importer.c:377 importers/netscape-importer.c:801
 #: importers/pine-importer.c:506
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "S'est� examinant %s"
 
-#: importers/elm-importer.c:528 importers/netscape-importer.c:967
+#: importers/elm-importer.c:528 importers/netscape-importer.c:974
 #: importers/pine-importer.c:669 mail/component-factory.c:96
 #, fuzzy
 msgid "Mail"
@@ -8439,22 +8524,22 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: importers/netscape-importer.c:897 importers/pine-importer.c:602
+#: importers/netscape-importer.c:904 importers/pine-importer.c:602
 #, fuzzy
 msgid "Scanning directory"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: importers/netscape-importer.c:906
+#: importers/netscape-importer.c:913
 #, fuzzy
 msgid "Starting import"
 msgstr "Data d'_inici:"
 
-#: importers/netscape-importer.c:972
+#: importers/netscape-importer.c:979
 #, fuzzy
 msgid "Settings"
 msgstr "_Par�metres"
 
-#: importers/netscape-importer.c:993
+#: importers/netscape-importer.c:1000
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8550,21 +8635,27 @@ msgstr "Propietats..."
 msgid "Change this folder's properties"
 msgstr "Propietats de la llista de coses per fer"
 
-#: mail/component-factory.c:790
+#: mail/component-factory.c:698
+msgid ""
+"Some of your mail settings seem corrupt, please check that everything is in "
+"order."
+msgstr ""
+
+#: mail/component-factory.c:812
 #, fuzzy
 msgid "New Mail Message"
 msgstr "FIXME: Missatge de _correu"
 
-#: mail/component-factory.c:790
+#: mail/component-factory.c:812
 #, fuzzy
 msgid "New _Mail Message"
 msgstr "FIXME: Missatge de _correu"
 
-#: mail/component-factory.c:821
+#: mail/component-factory.c:843
 msgid "Cannot initialize Evolution's mail component."
 msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
-#: mail/component-factory.c:1007
+#: mail/component-factory.c:1032
 msgid "Cannot register storage with shell"
 msgstr "No es pot registrar l'emmagatzemament amb l'int�rpret d'ordres"
 
@@ -8578,181 +8669,181 @@ msgstr "Propietats..."
 msgid "Properties"
 msgstr "Propietats..."
 
-#: mail/folder-browser.c:239 mail/mail-display.c:275
+#: mail/folder-browser.c:262 mail/mail-display.c:275
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "No s'ha pogut crear el directori temporal: %s"
 
-#: mail/folder-browser.c:708
+#: mail/folder-browser.c:734
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/folder-browser.c:711 mail/folder-browser.c:716
-#: mail/folder-browser.c:720
+#: mail/folder-browser.c:737 mail/folder-browser.c:742
+#: mail/folder-browser.c:746
 msgid ", "
 msgstr ""
 
-#: mail/folder-browser.c:712
+#: mail/folder-browser.c:738
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/folder-browser.c:717
+#: mail/folder-browser.c:743
 #, fuzzy, c-format
 msgid "%d selected"
 msgstr "Suprimeix"
 
-#: mail/folder-browser.c:722
+#: mail/folder-browser.c:748
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr " segons"
 
-#: mail/folder-browser.c:724
+#: mail/folder-browser.c:750
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/folder-browser.c:958
+#: mail/folder-browser.c:993
 #, fuzzy
 msgid "Create vFolder from Search"
 msgstr "Carpetes virtuals"
 
-#: mail/folder-browser.c:1303
+#: mail/folder-browser.c:1338
 #, fuzzy
 msgid "VFolder on _Subject"
 msgstr "VFolder sobre l'assumpte"
 
-#: mail/folder-browser.c:1306
+#: mail/folder-browser.c:1341
 msgid "VFolder on Se_nder"
 msgstr "VFolder sobre el remite_nt"
 
-#: mail/folder-browser.c:1309
+#: mail/folder-browser.c:1344
 msgid "VFolder on _Recipients"
 msgstr "VFolder sobre els destinata_ris"
 
-#: mail/folder-browser.c:1312
+#: mail/folder-browser.c:1347
 #, fuzzy
 msgid "VFolder on Mailing _List"
 msgstr "Filtre sobre la llista de correu"
 
-#: mail/folder-browser.c:1318
+#: mail/folder-browser.c:1353
 #, fuzzy
 msgid "Filter on Sub_ject"
 msgstr "Filtre sobre l'assumpte"
 
-#: mail/folder-browser.c:1321
+#: mail/folder-browser.c:1356
 #, fuzzy
 msgid "Filter on Sen_der"
 msgstr "Filtre sobre el remitent"
 
-#: mail/folder-browser.c:1324
+#: mail/folder-browser.c:1359
 #, fuzzy
 msgid "Filter on Re_cipients"
 msgstr "Filtre sobre els destinataris"
 
-#: mail/folder-browser.c:1327
+#: mail/folder-browser.c:1362
 #, fuzzy
 msgid "Filter on _Mailing List"
 msgstr "Filtre sobre la llista de correu"
 
-#: mail/folder-browser.c:1338 ui/evolution-mail-message.xml.h:89
+#: mail/folder-browser.c:1373 ui/evolution-mail-message.xml.h:89
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "_Anomena i desa..."
 
-#: mail/folder-browser.c:1340 ui/evolution-mail-message.xml.h:97
+#: mail/folder-browser.c:1375 ui/evolution-mail-message.xml.h:97
 #, fuzzy
 msgid "_Save As..."
 msgstr "Anomena i desa..."
 
-#: mail/folder-browser.c:1342
+#: mail/folder-browser.c:1377
 msgid "_Print"
 msgstr "_Imprimeix"
 
-#: mail/folder-browser.c:1347 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1382 ui/evolution-mail-message.xml.h:96
 #, fuzzy
 msgid "_Reply to Sender"
 msgstr "Respon al remitent"
 
-#: mail/folder-browser.c:1349 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1384 ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Reply to _List"
 msgstr "Respon a _tots"
 
-#: mail/folder-browser.c:1351 ui/evolution-mail-message.xml.h:68
+#: mail/folder-browser.c:1386 ui/evolution-mail-message.xml.h:68
 msgid "Reply to _All"
 msgstr "Respon a _tots"
 
-#: mail/folder-browser.c:1353
+#: mail/folder-browser.c:1388
 msgid "_Forward"
 msgstr "_Reenvia"
 
-#: mail/folder-browser.c:1356 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1391 ui/evolution-mail-message.xml.h:40
 #, fuzzy
 msgid "Mar_k as Read"
 msgstr "Mar_ca'l com a llegit"
 
-#: mail/folder-browser.c:1358 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1393 ui/evolution-mail-message.xml.h:42
 #, fuzzy
 msgid "Mark as U_nread"
 msgstr "Marca'l com a per _llegir"
 
-#: mail/folder-browser.c:1360
+#: mail/folder-browser.c:1395
 #, fuzzy
 msgid "Mark as _Important"
 msgstr "Marca'l com a per _llegir"
 
-#: mail/folder-browser.c:1362
+#: mail/folder-browser.c:1397
 #, fuzzy
 msgid "Mark as Unim_portant"
 msgstr "Marca'l com a per _llegir"
 
-#: mail/folder-browser.c:1367
+#: mail/folder-browser.c:1402
 #, fuzzy
 msgid "_Move to Folder..."
 msgstr "_Mou a la carpeta"
 
-#: mail/folder-browser.c:1369
+#: mail/folder-browser.c:1404
 #, fuzzy
 msgid "_Copy to Folder..."
 msgstr "_Copia a la carpeta"
 
-#: mail/folder-browser.c:1373 ui/evolution-mail-message.xml.h:99
+#: mail/folder-browser.c:1408 ui/evolution-mail-message.xml.h:99
 #, fuzzy
 msgid "_Undelete"
 msgstr "_Suprimeix"
 
-#: mail/folder-browser.c:1378
+#: mail/folder-browser.c:1413
 #, fuzzy
 msgid "Add Sender to Address Book"
 msgstr "Desa a la llibreta d'adreces"
 
-#: mail/folder-browser.c:1383
+#: mail/folder-browser.c:1418
 #, fuzzy
 msgid "Apply Filters"
 msgstr "_Aplica els filtres"
 
-#: mail/folder-browser.c:1387
+#: mail/folder-browser.c:1422
 #, fuzzy
 msgid "Create Ru_le From Message"
 msgstr "Carpetes virtuals"
 
-#: mail/folder-browser.c:1538
+#: mail/folder-browser.c:1573
 msgid "Filter on Mailing List"
 msgstr "Filtre sobre la llista de correu"
 
-#: mail/folder-browser.c:1539
+#: mail/folder-browser.c:1574
 #, fuzzy
 msgid "VFolder on Mailing List"
 msgstr "Filtre sobre la llista de correu"
 
-#: mail/folder-browser.c:1541
+#: mail/folder-browser.c:1576
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
 
-#: mail/folder-browser.c:1542
+#: mail/folder-browser.c:1577
 #, fuzzy, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
@@ -8831,19 +8922,19 @@ msgstr "Conducte de les coses per fer de l'Evolution"
 msgid "Evolution Account Editor"
 msgstr "Conducte de les coses per fer de l'Evolution"
 
-#: mail/mail-account-gui.c:945
+#: mail/mail-account-gui.c:947
 #, fuzzy
 msgid "Could not save signature file."
 msgstr ""
 "No s'ha pogut obrir el fitxer de signatura %s:\n"
 "%s"
 
-#: mail/mail-account-gui.c:1022
+#: mail/mail-account-gui.c:1024
 #, fuzzy
 msgid "Save signature"
 msgstr "Fitxer de signatura:"
 
-#: mail/mail-account-gui.c:1028
+#: mail/mail-account-gui.c:1030
 #, fuzzy
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
@@ -8854,7 +8945,7 @@ msgstr ""
 "\n"
 "Voleu desar-ne els canvis?"
 
-#: mail/mail-account-gui.c:1611
+#: mail/mail-account-gui.c:1615
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -8896,7 +8987,7 @@ msgstr ""
 "suprimir aquest contacte?"
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:757 mail/mail-config.glade.h:42
+#: mail/mail-accounts.c:760 mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Mail Settings"
 msgstr "_Par�metres"
@@ -8999,42 +9090,42 @@ msgstr ""
 msgid "This message contains invalid recipients:"
 msgstr ""
 
-#: mail/mail-callbacks.c:453
+#: mail/mail-callbacks.c:454
 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:549
+#: mail/mail-callbacks.c:550
 #, 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:779
+#: mail/mail-callbacks.c:783
 #, fuzzy
 msgid "an unknown sender"
 msgstr "Error desconegut"
 
-#: mail/mail-callbacks.c:784
+#: mail/mail-callbacks.c:788
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1162
+#: mail/mail-callbacks.c:1171
 msgid "Move message(s) to"
 msgstr "Mou el(s) missatge(s) cap a"
 
-#: mail/mail-callbacks.c:1164
+#: mail/mail-callbacks.c:1173
 msgid "Copy message(s) to"
 msgstr "Copia el(s) missatge(s) a"
 
-#: mail/mail-callbacks.c:1538
+#: mail/mail-callbacks.c:1547
 #, 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:1560
+#: mail/mail-callbacks.c:1569
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -9042,7 +9133,7 @@ msgstr ""
 "Nom�s podeu editar els missatges que s'hagin desat\n"
 "a la carpeta Esborranys."
 
-#: mail/mail-callbacks.c:1594
+#: mail/mail-callbacks.c:1603
 #, fuzzy
 msgid ""
 "You may only resend messages\n"
@@ -9051,34 +9142,34 @@ msgstr ""
 "Nom�s podeu editar els missatges que s'hagin desat\n"
 "a la carpeta Esborranys."
 
-#: mail/mail-callbacks.c:1606
+#: mail/mail-callbacks.c:1615
 #, 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:1627
+#: mail/mail-callbacks.c:1636
 #, fuzzy
 msgid "No Message Selected"
 msgstr "S'ha rebut el missatge"
 
-#: mail/mail-callbacks.c:1712
+#: mail/mail-callbacks.c:1721
 #, fuzzy
 msgid "Save Message As..."
 msgstr "Anomena i desa..."
 
-#: mail/mail-callbacks.c:1714
+#: mail/mail-callbacks.c:1723
 #, fuzzy
 msgid "Save Messages As..."
 msgstr "Anomena i desa..."
 
-#: mail/mail-callbacks.c:1859 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:1868 widgets/misc/e-messagebox.c:159
 #, fuzzy
 msgid "Warning"
 msgstr "S'est� movent"
 
-#: mail/mail-callbacks.c:1864
+#: mail/mail-callbacks.c:1873
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -9086,12 +9177,12 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1871
+#: mail/mail-callbacks.c:1880
 #, fuzzy
 msgid "Do not ask me again."
 msgstr "Envia aquest missatge"
 
-#: mail/mail-callbacks.c:1976
+#: mail/mail-callbacks.c:1985
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -9100,20 +9191,20 @@ msgstr ""
 "Error en carregar la informaci� del filtre:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1986
+#: mail/mail-callbacks.c:1995
 #, fuzzy
 msgid "Filters"
 msgstr "_Filtres de correu ..."
 
-#: mail/mail-callbacks.c:2032
+#: mail/mail-callbacks.c:2041
 msgid "Print Message"
 msgstr "Imprimeix el missatge"
 
-#: mail/mail-callbacks.c:2078
+#: mail/mail-callbacks.c:2087
 msgid "Printing of message failed"
 msgstr "Ha fallat la impressi� del missatge"
 
-#: mail/mail-callbacks.c:2162
+#: mail/mail-callbacks.c:2171
 #, fuzzy, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -9162,96 +9253,117 @@ msgstr ""
 msgid "Evolution Account Assistant"
 msgstr "Conducte de les coses per fer de l'Evolution"
 
-#: mail/mail-config.c:1486
-#, fuzzy
-msgid "Evolution Shortcuts"
-msgstr "Barra de _dreceres de l'Evolution"
+#: mail/mail-config.c:315
+#, fuzzy, c-format
+msgid "Account %d"
+msgstr "cont�"
 
-#. right now, the URL always works basically as a matter of luck...
-#. * both IMAP and mbox spool stores have INBOX as their inbox folder
-#. * name. I don't think this will work with maildir. How can we figure out
-#. * what shortcut to insert?
-#.
 #: mail/mail-config.c:1618
 #, c-format
+msgid ""
+"Could not get inbox for new mail store:\n"
+"%s\n"
+"No shortcut will be created."
+msgstr ""
+
+#. Create the shortcut. FIXME: This only works if the
+#. * full name matches the path.
+#.
+#: mail/mail-config.c:1629
+#, c-format
 msgid "%s: Inbox"
 msgstr ""
 
-#: mail/mail-config.c:1851
+#: mail/mail-config.c:1873
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:1922 mail/mail-config.c:1925
+#: mail/mail-config.c:1944 mail/mail-config.c:1947
 #, fuzzy
 msgid "Connecting to server..."
 msgstr "Connexi� de prova a \"%s\""
 
 #: mail/mail-config.glade.h:1
 #, fuzzy
+msgid " _Check for supported types "
+msgstr "Detecta els tipus suportats..."
+
+#: mail/mail-config.glade.h:2
+#, fuzzy
 msgid " color"
 msgstr "Colors"
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:3
 #, fuzzy
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "Account"
 msgstr "cont�"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "Account Information"
 msgstr "Cap informaci�"
 
-#: mail/mail-config.glade.h:5 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:6 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "Accounts"
 msgstr "cont�"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:10
 msgid "Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:10 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
 #, fuzzy
 msgid "Attachment"
 msgstr "adjunci�"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:12
 #, fuzzy
 msgid "Authentication"
 msgstr "Autenticaci�:"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Authentication Type: "
 msgstr "Autenticaci�:"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:14
 msgid "Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:16
 #, fuzzy
 msgid "Composer"
 msgstr "Redacta"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:17
+#, fuzzy
+msgid "Configuration"
+msgstr "Configuraci� del correu"
+
+#: mail/mail-config.glade.h:18
+#, fuzzy
+msgid "Confirm when Expunging a folder"
+msgstr "S'est� esborrant \"%s\""
+
+#: mail/mail-config.glade.h:19
 #, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -9264,362 +9376,345 @@ msgstr ""
 "Ja teniu enllestida la configuraci� del correu.\n"
 "Feu clic a \"Finalitza\" per desar els nous par�metres"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "De_fault"
 msgstr "Valors predeterminats"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:26
 msgid "Default Forward style is: "
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:27
 msgid "Default character encoding: "
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:29
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:30
 #, fuzzy
 msgid "Display"
 msgstr "_Visualitzaci�"
 
-#: mail/mail-config.glade.h:27 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:31 shell/glade/evolution-startup-wizard.glade.h:2
 #, fuzzy
 msgid "Done"
 msgstr "Cap"
 
-#: mail/mail-config.glade.h:28 shell/e-local-storage.c:174
+#: mail/mail-config.glade.h:32 shell/e-local-storage.c:174
 #, fuzzy
 msgid "Drafts"
 msgstr "Data de venciment"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "Drafts folder:"
 msgstr "Creaci� d'una nova carpeta"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:34
 #, fuzzy
 msgid "E_nable"
 msgstr "Inhabilitat"
 
-#: mail/mail-config.glade.h:31
-#, fuzzy
-msgid "Each account must have a different name."
-msgstr "l'hora actual"
-
-#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:96
 #: widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr "Edita..."
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:36
 #, fuzzy
 msgid "Enabled"
 msgstr "Inhabilitat"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:37
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:38
 #, fuzzy
 msgid "HTML signature file:"
 msgstr "Fitxer de signatura:"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:40 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Identitat"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:41
 msgid "In HTML mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Inline"
 msgstr "Visualitza en l�nia"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Kerberos "
 msgstr "Servidor:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:44
 msgid "Mail Configuration"
 msgstr "Configuraci� del correu"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Mailbox location"
 msgstr "Format"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:47
 msgid "Make this my _default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:45
-msgid "Message _preview should be displayed by default"
-msgstr ""
-
-#: mail/mail-config.glade.h:46
-msgid "Message list should display in a _threaded fashion by default"
-msgstr ""
-
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "NNTP Server:"
 msgstr "Servidor:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "News"
 msgstr "Nou"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Optional Information"
 msgstr "Cap informaci�"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:53
 msgid "PGP Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 msgid "Pick a color"
 msgstr "Agafa un color"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 #, fuzzy
 msgid "Prompt when sending messages with an _empty subject"
 msgstr "S'est� afegint un missatge sense cap assumpte"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr "S'est� afegint un missatge sense cap assumpte"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Qmail maildir "
 msgstr "Adre�a electr�nica 2"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid "Quoted"
 msgstr "Cap"
 
-#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:6
 #, fuzzy
 msgid "Receiving Email"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:63
 #, fuzzy
 msgid "Receiving Mail"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:64
 #, fuzzy
 msgid "Receiving Options"
 msgstr "Data de recepci�"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:65
 #, fuzzy
 msgid "Required Information"
 msgstr "Cap informaci�"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Secure MIME"
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:68
 msgid "Security"
 msgstr ""
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Select Filter Log file..."
 msgstr "Fitxer de signatura:"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:70
 msgid "Select PGP binary"
 msgstr ""
 
-#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:71 shell/glade/evolution-startup-wizard.glade.h:7
 #, fuzzy
 msgid "Sending Email"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Sending Mail"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:74 mail/message-list.etspec.h:6
 #: shell/e-local-storage.c:177
 #, fuzzy
 msgid "Sent"
 msgstr "Vist"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Agenda"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Sent messages folder:"
 msgstr "S'estan adjuntant els missatges de la carpeta \"%s\""
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Server Configuration"
 msgstr "Configuraci� del correu"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Server Type: "
 msgstr "Servidor:"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "Server requires _authentication"
 msgstr "Autenticaci�:"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:80
 msgid "Signature file:"
 msgstr "Fitxer de signatura:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "Source"
 msgstr "Font"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "Source Information"
 msgstr "Cap informaci�"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:83
 msgid "Sources"
 msgstr "Fonts"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Special Folders"
 msgstr "Carpetes virtuals"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:85
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:87
 msgid "Use secure connection (_SSL)"
 msgstr ""
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:88
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:92
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:93
 #, fuzzy
 msgid "_Automatically check for new mail every"
 msgstr "Comprova si hi ha nou correu"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "_Check for supported types"
 msgstr "Detecta els tipus suportats..."
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "_Email Address:"
 msgstr "Adre�a electr�nica:"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:98
 msgid "_Empty trash folders on exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 #, fuzzy
 msgid "_Full Name:"
 msgstr "Nom complet:"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "_HTML Signature:"
 msgstr "Fitxer de signatura:"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "_Highlight citations with"
 msgstr "Ressalta els elemts que vencen avui"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "_Host:"
 msgstr "Hores"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 msgid "_Log filter actions to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 #, fuzzy
 msgid "_Mark messages as Read after"
 msgstr "Marca el missatge com a vist [ms]: "
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 #, fuzzy
 msgid "_Name:"
 msgstr "Nom:"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 #, fuzzy
 msgid "_Organization:"
 msgstr "Organitzaci�:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:109
 msgid "_PGP binary path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "_Path:"
 msgstr "Cam�:"
 
-#: mail/mail-config.glade.h:110
-msgid "_Remember PGP Passphrase until exit"
-msgstr ""
-
 #: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "_Remember this password"
@@ -9658,47 +9753,47 @@ msgstr ""
 msgid "seconds."
 msgstr "segons."
 
-#: mail/mail-crypto.c:60
+#: mail/mail-crypto.c:59
 #, fuzzy
 msgid "Could not create a PGP signature context."
 msgstr "No s'ha pogut crear el quadre de di�leg."
 
-#: mail/mail-crypto.c:86
+#: mail/mail-crypto.c:84
 #, fuzzy
 msgid "Could not create a PGP verification context."
 msgstr "No s'ha pogut crear el quadre de di�leg."
 
-#: mail/mail-crypto.c:116
+#: mail/mail-crypto.c:113
 #, fuzzy
 msgid "Could not create a PGP encryption context."
 msgstr "No s'ha pogut crear el quadre de di�leg."
 
-#: mail/mail-crypto.c:142
+#: mail/mail-crypto.c:138
 #, fuzzy
 msgid "Could not create a PGP decryption context."
 msgstr "No s'ha pogut crear el quadre de di�leg."
 
-#: mail/mail-crypto.c:177
+#: mail/mail-crypto.c:173
 #, fuzzy
 msgid "Could not create a S/MIME signature context."
 msgstr "No s'ha pogut crear el quadre de di�leg."
 
-#: mail/mail-crypto.c:209
+#: mail/mail-crypto.c:205
 #, fuzzy
 msgid "Could not create a S/MIME certsonly context."
 msgstr "No s'ha pogut crear el quadre de di�leg."
 
-#: mail/mail-crypto.c:240
+#: mail/mail-crypto.c:236
 #, fuzzy
 msgid "Could not create a S/MIME encryption context."
 msgstr "No s'ha pogut crear el quadre de di�leg."
 
-#: mail/mail-crypto.c:271
+#: mail/mail-crypto.c:267
 #, fuzzy
 msgid "Could not create a S/MIME envelope context."
 msgstr "No s'ha pogut crear el quadre de di�leg."
 
-#: mail/mail-crypto.c:301
+#: mail/mail-crypto.c:297
 #, fuzzy
 msgid "Could not create a S/MIME decode context."
 msgstr "No s'ha pogut crear el quadre de di�leg."
@@ -9748,12 +9843,12 @@ msgstr "Obre'l en una nova finestra"
 msgid "Copy Link Location"
 msgstr "_Contacte (FIXME)"
 
-#: mail/mail-display.c:1519
+#: mail/mail-display.c:1520
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "_Tasca (FIXME)"
 
-#: mail/mail-display.c:1521
+#: mail/mail-display.c:1523
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Anomena i desa..."
@@ -9773,92 +9868,92 @@ msgstr "No s'ha pogut obrir la carpeta: la llista de missatges era incompleta."
 msgid "Date"
 msgstr "Data de venciment"
 
-#: mail/mail-format.c:860
+#: mail/mail-format.c:862
 #, fuzzy
 msgid "Bad Address"
 msgstr "Adre�a electr�nica:"
 
-#: mail/mail-format.c:882 mail/message-list.etspec.h:3
+#: mail/mail-format.c:903 mail/message-list.etspec.h:3
 #, fuzzy
 msgid "From"
 msgstr "De:"
 
-#: mail/mail-format.c:885
+#: mail/mail-format.c:906
 #, fuzzy
 msgid "Reply-To"
 msgstr "Respon"
 
-#: mail/mail-format.c:888 mail/message-list.etspec.h:10
+#: mail/mail-format.c:910 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Per a"
 
-#: mail/mail-format.c:891
+#: mail/mail-format.c:914
 #, fuzzy
 msgid "Cc"
 msgstr "Cc:"
 
-#: mail/mail-format.c:1311
+#: mail/mail-format.c:1357
 #, fuzzy
 msgid "No GPG/PGP program configured."
 msgstr "No hi ha cap programa GPG/PGP disponible."
 
-#: mail/mail-format.c:1327
+#: mail/mail-format.c:1373
 #, fuzzy
 msgid "Encrypted message not displayed"
 msgstr "Esborra la visualitzaci� del missatge"
 
-#: mail/mail-format.c:1338
+#: mail/mail-format.c:1384
 #, fuzzy
 msgid "Encrypted message"
 msgstr "Edita el missatge"
 
-#: mail/mail-format.c:1339
+#: mail/mail-format.c:1385
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1394
+#: mail/mail-format.c:1440
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1405
+#: mail/mail-format.c:1451
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2083
+#: mail/mail-format.c:2128
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2097
+#: mail/mail-format.c:2142
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2102
+#: mail/mail-format.c:2147
 #, fuzzy, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
 
-#: mail/mail-format.c:2131
+#: mail/mail-format.c:2176
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
 
-#: mail/mail-format.c:2139
+#: mail/mail-format.c:2184
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2144
+#: mail/mail-format.c:2189
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:547
+#: mail/mail-local.c:563
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "_Configura la carpeta"
 
-#: mail/mail-local.c:620
+#: mail/mail-local.c:636
 #, fuzzy, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -9867,29 +9962,29 @@ msgstr ""
 "No es pot desar la informaci� meta de la carpeta; probablement\n"
 "no la podreu tornar a obrir: %s"
 
-#: mail/mail-local.c:676
+#: mail/mail-local.c:689
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "No es pot bifurcar %s: %s"
 
-#: mail/mail-local.c:722
+#: mail/mail-local.c:735
 #, 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:1052
+#: mail/mail-local.c:1075
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "S'est� convertint la carpeta \"%s\" al format \"%s\""
 
-#: mail/mail-local.c:1067
+#: mail/mail-local.c:1090
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1089
+#: mail/mail-local.c:1112
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -9897,16 +9992,16 @@ msgstr ""
 "Si ja no podeu obrir aquesta b�stia de correu\n"
 "potser us caldr� reparar-la manualment."
 
-#: mail/mail-local.c:1180
+#: mail/mail-local.c:1200
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-local.c:1190
+#: mail/mail-local.c:1209
 #, fuzzy, c-format
-msgid "Reconfigure %s"
+msgid "Reconfigure /%s"
 msgstr "_Configura la carpeta"
 
-#: mail/mail-mt.c:188
+#: mail/mail-mt.c:199
 #, fuzzy, c-format
 msgid ""
 "Error while '%s':\n"
@@ -9915,7 +10010,7 @@ msgstr ""
 "Error en `%s':\n"
 "%s"
 
-#: mail/mail-mt.c:191
+#: mail/mail-mt.c:202
 #, fuzzy, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -9925,21 +10020,25 @@ msgstr ""
 "%s"
 
 #. Remember the password?
-#: mail/mail-mt.c:454
+#: mail/mail-mt.c:509
 msgid "Remember this password"
 msgstr ""
 
-#: mail/mail-mt.c:511
+#: mail/mail-mt.c:510
+msgid "Remember this password for the remainder of this session"
+msgstr ""
+
+#: mail/mail-mt.c:567
 #, fuzzy, c-format
 msgid "Enter Password for %s"
 msgstr "Si us plau, introdu�u la contrasenya NNTP per a %s@%s"
 
-#: mail/mail-mt.c:514
+#: mail/mail-mt.c:570
 #, fuzzy
 msgid "Enter Password"
 msgstr "Si us plau, introdu�u la contrasenya NNTP per a %s@%s"
 
-#: mail/mail-mt.c:824
+#: mail/mail-mt.c:886
 #, fuzzy
 msgid "Working"
 msgstr "S'est� movent"
@@ -10098,6 +10197,11 @@ msgstr "No s'han pogut escriure les dades: %s"
 msgid "Disconnecting from %s"
 msgstr "S'est� recollint el correu des de %s"
 
+#: mail/mail-ops.c:2065
+#, fuzzy, c-format
+msgid "Reconnecting to %s"
+msgstr "S'est� recollint el correu des de %s"
+
 #: mail/mail-search-dialogue.c:113
 #, fuzzy
 msgid "_Search"
@@ -10162,12 +10266,12 @@ msgstr ""
 msgid "Type: %s"
 msgstr "Tipus:"
 
-#: mail/mail-send-recv.c:282
+#: mail/mail-send-recv.c:283
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "Sendmail"
 
-#: mail/mail-send-recv.c:283
+#: mail/mail-send-recv.c:284
 #, fuzzy
 msgid "Cancel All"
 msgstr "Cancel�lat"
@@ -10192,36 +10296,50 @@ msgstr "Cancel�lat"
 msgid "User canceled operation."
 msgstr "Consulta cancel�lada per l'usuari."
 
-#: mail/mail-tools.c:173
+#: mail/mail-tools.c:133
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "No s'ha pogut crear la mbox temporal `%s': %s"
 
-#: mail/mail-tools.c:299
+#: mail/mail-tools.c:259
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-tools.c:303
+#: mail/mail-tools.c:263
 #, fuzzy
 msgid "Forwarded message"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-tools.c:439
+#: mail/mail-tools.c:396
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "Reenvia el missatge"
 
-#: mail/mail-vfolder.c:161
+#: mail/mail-vfolder.c:84
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-vfolder.c:435
+#: mail/mail-vfolder.c:201
+#, fuzzy, c-format
+msgid "Updating vfolders for uri: %s"
+msgstr "S'est� carregant la carpeta %s"
+
+#: mail/mail-vfolder.c:414
+#, c-format
+msgid ""
+"The following vFolder(s):\n"
+"%sUsed the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+
+#: mail/mail-vfolder.c:636
 msgid "VFolders"
 msgstr "VFolders"
 
-#: mail/mail-vfolder.c:541
+#: mail/mail-vfolder.c:742
 msgid "New VFolder"
 msgstr "Nova VFolder"
 
@@ -10300,7 +10418,7 @@ msgstr "%I:%M %p"
 msgid "%b %d %Y"
 msgstr "%a %d %Y"
 
-#: mail/message-list.c:2331
+#: mail/message-list.c:2334
 #, fuzzy
 msgid "Generating message list"
 msgstr "C�pia de missatges"
@@ -10398,36 +10516,36 @@ msgid "Evolution component for the executive summary."
 msgstr ""
 "No es pot inicialitzar el component de resum del correu de l'Evolution."
 
-#: my-evolution/component-factory.c:30
+#: my-evolution/component-factory.c:45
 msgid "Folder containing the Evolution Summary"
 msgstr ""
 
-#: my-evolution/component-factory.c:139
+#: my-evolution/component-factory.c:154
 #, fuzzy
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
-#: my-evolution/e-summary-calendar.c:248 my-evolution/e-summary-calendar.c:266
+#: my-evolution/e-summary-calendar.c:263 my-evolution/e-summary-calendar.c:281
 #, fuzzy
 msgid "Appointments"
 msgstr "Cites:"
 
-#: my-evolution/e-summary-calendar.c:249
+#: my-evolution/e-summary-calendar.c:264
 #, fuzzy
 msgid "No appointments"
 msgstr "Mostra les hores d'acabament de les cites"
 
-#: my-evolution/e-summary-calendar.c:286
+#: my-evolution/e-summary-calendar.c:301
 #, fuzzy
 msgid "%k%M %d %B"
 msgstr "%A, %d de %B"
 
-#: my-evolution/e-summary-calendar.c:288
+#: my-evolution/e-summary-calendar.c:303
 #, fuzzy
 msgid "%l:%M %d %B"
 msgstr "%A, %d de %B"
 
-#: my-evolution/e-summary-mail.c:115
+#: my-evolution/e-summary-mail.c:130
 #, fuzzy
 msgid "Mail summary"
 msgstr "Sense resum"
@@ -10436,92 +10554,92 @@ msgstr "Sense resum"
 #. see in My Evolution by default. You can find the list of all
 #. stations and their codes in Evolution sources
 #. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-preferences.c:65
-#: my-evolution/e-summary-weather.c:615
+#: my-evolution/e-summary-preferences.c:80
+#: my-evolution/e-summary-weather.c:630
 msgid "KBOS:ZSAM:EGAA"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:427
+#: my-evolution/e-summary-preferences.c:441
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:449
+#: my-evolution/e-summary-preferences.c:463
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:890
+#: my-evolution/e-summary-preferences.c:929
 #, fuzzy
 msgid "Add a news feed"
 msgstr "Afegeix un servidor de not�cies"
 
-#: my-evolution/e-summary-preferences.c:898
+#: my-evolution/e-summary-preferences.c:937
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:902
+#: my-evolution/e-summary-preferences.c:941
 msgid "Name:"
 msgstr "Nom:"
 
-#: my-evolution/e-summary-preferences.c:1438
+#: my-evolution/e-summary-preferences.c:1486
 #, fuzzy
 msgid "Summary Settings"
 msgstr "_Par�metres"
 
-#: my-evolution/e-summary-rdf.c:277 my-evolution/e-summary-rdf.c:362
-#: my-evolution/e-summary-rdf.c:395
+#: my-evolution/e-summary-rdf.c:297 my-evolution/e-summary-rdf.c:382
+#: my-evolution/e-summary-rdf.c:415
 #, fuzzy
 msgid "Error downloading RDF"
 msgstr "Error en carregar el fitxer: %s"
 
-#: my-evolution/e-summary-rdf.c:487
+#: my-evolution/e-summary-rdf.c:507
 #, fuzzy
 msgid "News Feed"
 msgstr "Servidors de not�cies"
 
-#: my-evolution/e-summary-tasks.c:216
+#: my-evolution/e-summary-tasks.c:238
 #, fuzzy
 msgid "No tasks"
 msgstr "Mostra les _adjuncions"
 
-#: my-evolution/e-summary-tasks.c:255
+#: my-evolution/e-summary-tasks.c:277
 #, fuzzy
 msgid "(No Description)"
 msgstr "(Sense descripci�)"
 
-#: my-evolution/e-summary-weather.c:57
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:334
+#: my-evolution/e-summary-weather.c:349
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:524
+#: my-evolution/e-summary-weather.c:539
 #, fuzzy
 msgid "Weather"
 msgstr "Altres"
 
-#: my-evolution/e-summary-weather.c:676
+#: my-evolution/e-summary-weather.c:691
 #, fuzzy
 msgid "Regions"
 msgstr "Seccions:"
 
-#: my-evolution/e-summary.c:162
+#: my-evolution/e-summary.c:187
 #, fuzzy
 msgid "%A, %B %e %Y"
 msgstr "%A, %d de %B de %Y"
 
-#: my-evolution/e-summary.c:512 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:568 ui/my-evolution.xml.h:3
 #, fuzzy
 msgid "Print Summary"
 msgstr "R_esum"
 
-#: my-evolution/e-summary.c:558
+#: my-evolution/e-summary.c:614
 #, fuzzy
 msgid "Printing of Summary failed"
 msgstr "Ha fallat la impressi� del missatge"
 
-#: my-evolution/main.c:52
+#: my-evolution/main.c:67
 #, fuzzy
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
@@ -11984,43 +12102,43 @@ msgstr ""
 "de l'Evolution. Si us plau, moveu-lo per permetre\n"
 "la instal�laci� dels fitxers d'usuari de l'Evolution."
 
-#: shell/e-shell-folder-commands.c:174
+#: shell/e-shell-folder-commands.c:176
 #, fuzzy
 msgid "Cannot move a folder over itself."
 msgstr "No es pot bifurcar %s: %s"
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:178
 #, fuzzy
 msgid "Cannot copy a folder over itself."
 msgstr ""
 "No es poden copiar els fitxers a\n"
 "`%s'."
 
-#: shell/e-shell-folder-commands.c:190
+#: shell/e-shell-folder-commands.c:192
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:294
+#: shell/e-shell-folder-commands.c:312
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:299
+#: shell/e-shell-folder-commands.c:317
 #, fuzzy
 msgid "Copy folder"
 msgstr "Copia a la carpeta"
 
-#: shell/e-shell-folder-commands.c:337
+#: shell/e-shell-folder-commands.c:359
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:342
+#: shell/e-shell-folder-commands.c:364
 #, fuzzy
 msgid "Move folder"
 msgstr "Mou a la carpeta"
 
-#: shell/e-shell-folder-commands.c:367
+#: shell/e-shell-folder-commands.c:390
 #, fuzzy, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -12029,37 +12147,37 @@ msgstr ""
 "No s'ha pogut suprimir la carpeta `%s':\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:383
+#: shell/e-shell-folder-commands.c:406
 #, fuzzy, c-format
-msgid "Delete folder '%s'"
-msgstr "Suprimeix la tasca"
+msgid "Delete \"%s\""
+msgstr "Crea \"%s\""
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:393
+#: shell/e-shell-folder-commands.c:416
 #, fuzzy, c-format
-msgid "Are you sure you want to remove the '%s' folder?"
+msgid "Are you sure you want to remove the \"%s\" folder?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#. Popup a dialog asking what the user would like to rename
-#. the folder to
-#: shell/e-shell-folder-commands.c:468
+#: shell/e-shell-folder-commands.c:470
 #, fuzzy, c-format
-msgid "Rename folder '%s'"
-msgstr "S'estan escanejant les carpetes de \"%s\""
+msgid ""
+"Cannot rename folder:\n"
+"%s"
+msgstr ""
+"No s'ha pogut suprimir la carpeta `%s':\n"
+"%s"
 
-#: shell/e-shell-folder-commands.c:472
-#, fuzzy
-msgid "Rename"
-msgstr "Nom de la regla: "
+#: shell/e-shell-folder-commands.c:503
+#, fuzzy, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#. Make, pack the label
-#: shell/e-shell-folder-commands.c:480
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: shell/e-shell-folder-commands.c:506
 #, fuzzy
-msgid "Folder name:"
-msgstr "Nom del fitxer:"
+msgid "Rename folder"
+msgstr "S'estan escanejant les carpetes de \"%s\""
 
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
@@ -12097,7 +12215,7 @@ msgstr "El nom de carpeta indicat no �s v�lid."
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Crea una nova carpeta"
 
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:99
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -12105,7 +12223,7 @@ msgstr ""
 "El tipus de la carpeta seleccionada no �s v�lid per a\n"
 "l'operaci� sol�licitada."
 
-#: shell/e-shell-folder-selection-dialog.c:348
+#: shell/e-shell-folder-selection-dialog.c:360
 msgid "New..."
 msgstr "Nou..."
 
@@ -12113,7 +12231,11 @@ msgstr "Nou..."
 msgid "(Untitled)"
 msgstr "(Sense t�tol)"
 
-#: shell/e-shell-importer.c:102
+#: shell/e-shell-importer.c:141
+msgid "Choose the type of importer to run"
+msgstr ""
+
+#: shell/e-shell-importer.c:144
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -12122,9 +12244,13 @@ msgid ""
 "to work it out."
 msgstr ""
 
+#: shell/e-shell-importer.c:150
+msgid "Please select the information that you would like to import"
+msgstr ""
+
 #. Importer isn't ready yet.
 #. Wait 5 seconds and try again.
-#: shell/e-shell-importer.c:197
+#: shell/e-shell-importer.c:242
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -12132,88 +12258,112 @@ msgid ""
 "Waiting 5 seconds to retry."
 msgstr ""
 
-#: shell/e-shell-importer.c:217 shell/e-shell-importer.c:248
+#: shell/e-shell-importer.c:262 shell/e-shell-importer.c:293
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:351
+#: shell/e-shell-importer.c:396
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "La carpeta `%s' no existeix."
 
-#: shell/e-shell-importer.c:363
+#: shell/e-shell-importer.c:408
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:378
+#: shell/e-shell-importer.c:423
 #, 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:388
+#: shell/e-shell-importer.c:433
 #, fuzzy
 msgid "Importing"
 msgstr "S'est� movent"
 
-#: shell/e-shell-importer.c:396
+#: shell/e-shell-importer.c:441
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:454
 #, fuzzy, c-format
 msgid "Error starting %s"
 msgstr "Error en carregar el fitxer: %s"
 
-#: shell/e-shell-importer.c:428
+#: shell/e-shell-importer.c:473
 #, fuzzy, c-format
 msgid "Error loading %s"
 msgstr "Error en carregar el fitxer: %s"
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:490
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:560
 #, fuzzy
 msgid "Automatic"
 msgstr "Tria autom�tica"
 
-#: shell/e-shell-importer.c:566
+#: shell/e-shell-importer.c:611
 #, fuzzy
 msgid "Filename:"
 msgstr "Nom del fitxer:"
 
-#: shell/e-shell-importer.c:571
+#: shell/e-shell-importer.c:616
 #, fuzzy
 msgid "Select a file"
 msgstr "Fitxer de signatura:"
 
-#: shell/e-shell-importer.c:581
+#: shell/e-shell-importer.c:626
 #, fuzzy
 msgid "File type:"
 msgstr "Nom del fitxer:"
 
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:651
+msgid "Import data and settings from older programs"
+msgstr ""
+
+#: shell/e-shell-importer.c:655
+#, fuzzy
+msgid "Import a single file"
+msgstr "S'est� movent"
+
+#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:582
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:585
+msgid "Starting Intelligent Importers"
+msgstr ""
+
+#: shell/e-shell-importer.c:840 shell/e-shell-startup-wizard.c:703
+#, fuzzy, c-format
+msgid "From %s:"
+msgstr "De:"
+
+#: shell/e-shell-importer.c:1003
 #, fuzzy
 msgid "Select folder"
 msgstr "Seleccioneu una carpeta"
 
-#: shell/e-shell-importer.c:646
+#: shell/e-shell-importer.c:1004
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:689 shell/importer/intelligent.c:194
+#: shell/e-shell-importer.c:1116 shell/importer/intelligent.c:194
 msgid "Import"
 msgstr ""
 
@@ -12234,46 +12384,31 @@ msgid "Cannot initialize the Evolution Mailer Wizard interface"
 msgstr ""
 "No es pot inicialitzar el hash d'emmagatzematge de correu de l'Evolution."
 
-#: shell/e-shell-startup-wizard.c:582
-msgid ""
-"Please wait...\n"
-"Scanning for existing setups"
-msgstr ""
-
-#: shell/e-shell-startup-wizard.c:585
-msgid "Starting Intelligent Importers"
-msgstr ""
-
-#: shell/e-shell-startup-wizard.c:703
-#, fuzzy, c-format
-msgid "From %s:"
-msgstr "De:"
-
 #: shell/e-shell-startup-wizard.c:745
 msgid ""
 "Please select the information\n"
 "that you would like to import"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:183
+#: shell/e-shell-view-menu.c:201
 msgid "Bug buddy was not found in your $PATH."
 msgstr "No s'ha trobat el Bug Buddy en el vostre $PATH."
 
-#: shell/e-shell-view-menu.c:191
+#: shell/e-shell-view-menu.c:209
 msgid "Bug buddy could not be run."
 msgstr "No es pot executar el Bug Buddy."
 
-#: shell/e-shell-view-menu.c:217
+#: shell/e-shell-view-menu.c:235
 #, fuzzy
 msgid "Ximian Evolution"
 msgstr "Evolution"
 
-#: shell/e-shell-view-menu.c:219
+#: shell/e-shell-view-menu.c:237
 #, fuzzy
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:221
+#: shell/e-shell-view-menu.c:239
 #, fuzzy
 msgid ""
 "Ximian Evolution is a suite of groupware applications\n"
@@ -12284,29 +12419,38 @@ msgstr ""
 "per a correu, agenda i gesti� de contactes\n"
 "dins de l'entorn d'escriptori GNOME."
 
-#: shell/e-shell-view-menu.c:424
+#: shell/e-shell-view-menu.c:442
 msgid "Go to folder..."
 msgstr "V�s a la carpeta..."
 
-#: shell/e-shell-view-menu.c:425
+#: shell/e-shell-view-menu.c:443
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:570
+#: shell/e-shell-view-menu.c:563
 #, fuzzy
 msgid "Create a new shortcut"
 msgstr "Crea un nou grup de dreceres"
 
-#: shell/e-shell-view-menu.c:571
+#: shell/e-shell-view-menu.c:564
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:685
+#: shell/e-shell-view-menu.c:595
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:603
+#, fuzzy, c-format
+msgid "Error executing %s."
+msgstr "Error en desar el fitxer: %s"
+
+#: shell/e-shell-view-menu.c:705
 #, fuzzy
 msgid "Work Online"
 msgstr "S'est� movent"
 
-#: shell/e-shell-view-menu.c:698 shell/e-shell-view-menu.c:711
+#: shell/e-shell-view-menu.c:718 shell/e-shell-view-menu.c:731
 #: ui/evolution.xml.h:30
 #, fuzzy
 msgid "Work Offline"
@@ -12316,46 +12460,46 @@ msgstr "S'est� movent"
 msgid "(No folder displayed)"
 msgstr "(Cap carpeta mostrada)"
 
-#: shell/e-shell-view.c:1478
+#: shell/e-shell-view.c:1512
 #, c-format
 msgid "%s (%d)"
 msgstr ""
 
-#: shell/e-shell-view.c:1480
+#: shell/e-shell-view.c:1514
 #, fuzzy
 msgid "(None)"
 msgstr "(Sense nom)"
 
-#: shell/e-shell-view.c:1485
+#: shell/e-shell-view.c:1519
 #, fuzzy, c-format
 msgid "%s - Ximian Evolution %s"
 msgstr "Evolution - %s"
 
-#: shell/e-shell-view.c:1487
+#: shell/e-shell-view.c:1521
 #, fuzzy, c-format
 msgid "%s - Ximian Evolution %s [%s]"
 msgstr "Evolution - %s"
 
-#: shell/e-shell-view.c:1527
+#: shell/e-shell-view.c:1561
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1534
+#: shell/e-shell-view.c:1568
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1540
+#: shell/e-shell-view.c:1574
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:560
+#: shell/e-shell.c:562
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "No es pot configurar l'emmagatzemament local -- %s"
 
-#: shell/e-shell.c:1496
+#: shell/e-shell.c:1488
 #, fuzzy, c-format
 msgid ""
 "Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
@@ -12364,25 +12508,25 @@ msgstr ""
 "Ep!  La visualitzaci� de `%s' s'ha mort inesperadament.  :-(\n"
 "Aix� segurament vol dir que el component %s ha petat."
 
-#: shell/e-shell.c:1700 widgets/misc/e-cell-date-edit.c:248
+#: shell/e-shell.c:1692 widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr ""
 
-#: shell/e-shell.c:1702
+#: shell/e-shell.c:1694
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:1704
+#: shell/e-shell.c:1696
 #, fuzzy
 msgid "Cannot register on OAF"
 msgstr "No es pot registrar l'emmagatzemament amb l'int�rpret d'ordres"
 
-#: shell/e-shell.c:1706
+#: shell/e-shell.c:1698
 #, fuzzy
 msgid "Configuration Database not found"
 msgstr "Configuraci� del correu"
 
-#: shell/e-shell.c:1708 shell/e-storage.c:491
+#: shell/e-shell.c:1700 shell/e-storage.c:496
 msgid "Generic error"
 msgstr "Error gen�ric"
 
@@ -12522,52 +12666,61 @@ msgstr "Error en desar les dreceres."
 msgid "Shortcuts"
 msgstr "Mostra la barra de _dreceres"
 
+#: shell/e-storage-set-view.c:645
+#, fuzzy, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr ""
+"No s'ha pogut suprimir la carpeta `%s':\n"
+"%s"
+
 #: shell/e-storage.c:182 shell/e-storage.c:188
 msgid "(No name)"
 msgstr "(Sense nom)"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:494
 msgid "No error"
 msgstr "Cap error"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:498
 msgid "A folder with the same name already exists"
 msgstr "Ja existeix una carpeta amb el mateix nom"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:500
 msgid "The specified folder type is not valid"
 msgstr "El tipus de carpeta especificat no �s v�lid"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:502
 msgid "I/O error"
 msgstr "Error d'E/S"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:504
 msgid "Not enough space to create the folder"
 msgstr "No hi ha espai suficient per crear la carpeta"
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:506
 msgid "The specified folder was not found"
 msgstr "No s'ha trobat la carpeta indicada"
 
-#: shell/e-storage.c:503
+#: shell/e-storage.c:508
 msgid "Function not implemented in this storage"
 msgstr "Funci� no implementada en aquest emmagatzemament"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:512
 msgid "Operation not supported"
 msgstr "Operaci� no suportada"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:514
 msgid "The specified type is not supported in this storage"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:516
 #, fuzzy
 msgid "The specified folder cannot be modified or removed"
 msgstr "No s'ha trobat la carpeta indicada"
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:518
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
@@ -12599,6 +12752,11 @@ msgstr "Hores"
 msgid "The following connections are currently active:"
 msgstr ""
 
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#, fuzzy
+msgid "Folder name:"
+msgstr "Nom del fitxer:"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 #, fuzzy
 msgid "Folder type:"
@@ -12655,15 +12813,25 @@ msgid "Evolution Importer Assistant"
 msgstr "Conducte de les coses per fer de l'Evolution"
 
 #: shell/importer/import.glade.h:4
-msgid "Import File (Step 2 of 2)"
-msgstr ""
+#, fuzzy
+msgid "Import File (step 3 of 3)"
+msgstr "Fitxer de signatura:"
 
 #: shell/importer/import.glade.h:5
+msgid "Importer Type (step 1 of 3)"
+msgstr ""
+
+#: shell/importer/import.glade.h:6
 #, fuzzy
-msgid "Select a File (step 1 of 2)"
+msgid "Select Importers (step 2 of 3)"
 msgstr "Fitxer de signatura:"
 
-#: shell/importer/import.glade.h:6
+#: shell/importer/import.glade.h:7
+#, fuzzy
+msgid "Select a File (step 2 of 3)"
+msgstr "Fitxer de signatura:"
+
+#: shell/importer/import.glade.h:8
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of\n"
@@ -12916,13 +13084,6 @@ msgstr "_Cerca contactes"
 msgid "_Select All"
 msgstr "Selecciona'ls _tots"
 
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:44
-#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
-#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:19
-#: ui/my-evolution.xml.h:9
-msgid "_Tools"
-msgstr "_Eines"
-
 #: ui/evolution-calendar.xml.h:2
 msgid "Configure the calendar's settings"
 msgstr ""
@@ -13121,8 +13282,8 @@ 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:49
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:36
 msgid "_File"
 msgstr "_Fitxer"
@@ -13145,8 +13306,8 @@ msgstr "Desa el contacte i tanca el quadre de di�leg"
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:54
-#: ui/evolution-signature-editor.xml.h:11
+#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Save"
 msgstr "_Desa"
 
@@ -13844,6 +14005,11 @@ msgstr "_Visualitzaci�"
 msgid "_Open Message"
 msgstr "_Edita el missatge"
 
+#: ui/evolution-mail-message.xml.h:98 ui/evolution.xml.h:49
+#: ui/my-evolution.xml.h:9
+msgid "_Tools"
+msgstr "_Eines"
+
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 #, fuzzy
 msgid "Close this window"
@@ -13857,8 +14023,8 @@ msgstr "Suprimeix aquesta cita"
 msgid "_Close"
 msgstr "Tanca"
 
-#: ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:48
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:50
 msgid "_View"
 msgstr "_Visualitza"
 
@@ -14046,40 +14212,35 @@ msgid "_Cc Field"
 msgstr "Camps"
 
 #: ui/evolution-message-composer.xml.h:46
-#: ui/evolution-signature-editor.xml.h:6
-msgid "_Debug"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:47
 #, fuzzy
 msgid "_Delete all"
 msgstr "_Suprimeix"
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:49
 msgid "_From Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:51
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-signature-editor.xml.h:9
 #, fuzzy
 msgid "_Insert"
 msgstr "_�ndex"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:51
 #, fuzzy
 msgid "_Open..."
 msgstr "_Obre..."
 
-#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-message-composer.xml.h:52
 #, fuzzy
 msgid "_Reply-To Field"
 msgstr "Respon"
 
-#: ui/evolution-message-composer.xml.h:55
+#: ui/evolution-message-composer.xml.h:54
 msgid "_Security"
 msgstr ""
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "_Ajuda"
 
@@ -14230,7 +14391,7 @@ msgid "Exit the program"
 msgstr "Surt del programa"
 
 #: ui/evolution.xml.h:15
-msgid "Import an external file format"
+msgid "Import data from other programs"
 msgstr ""
 
 #: ui/evolution.xml.h:17
@@ -14315,8 +14476,8 @@ msgstr "_V�s a la carpeta..."
 
 #: ui/evolution.xml.h:41
 #, fuzzy
-msgid "_Import File..."
-msgstr "_Insereix el fitxer de text... (FIXME)"
+msgid "_Import..."
+msgstr "S'est� movent"
 
 #: ui/evolution.xml.h:42
 #, fuzzy
@@ -14334,20 +14495,25 @@ msgstr "Nova VFolder"
 
 #: ui/evolution.xml.h:45
 #, fuzzy
+msgid "_Pilot Settings..."
+msgstr "_Par�metres"
+
+#: ui/evolution.xml.h:46
+#, fuzzy
 msgid "_Rename..."
 msgstr "_Tanca..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:47
 #, fuzzy
 msgid "_Shortcut"
 msgstr "Mostra la barra de _dreceres"
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:48
 #, fuzzy
 msgid "_Shortcut Bar"
 msgstr "Mostra la barra de _dreceres"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:51
 #, fuzzy
 msgid "_Work Offline"
 msgstr "S'est� movent"
@@ -14458,11 +14624,11 @@ msgstr "DDDDDDD"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:433
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:439
 msgid "Now"
 msgstr "Ara"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:445
 msgid "Today"
 msgstr "Avui"
 
@@ -14625,24 +14791,56 @@ msgstr "Afegeix una font"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr ""
 
-#: wombat/wombat.c:175
+#: wombat/wombat.c:176
 #, fuzzy
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
 
-#: wombat/wombat.c:187
+#: wombat/wombat.c:188
 #, fuzzy
 msgid "init_corba(): could not initialize GNOME"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
 
-#: wombat/wombat.c:200
+#: wombat/wombat.c:201
 #, fuzzy
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
 
 #, fuzzy
-#~ msgid "Cannot open folder: %s: No such folder"
-#~ msgstr "No es pot bifurcar %s: %s"
+#~ msgid "_Calendar Information:"
+#~ msgstr "Cap informaci�"
+
+#, fuzzy
+#~ msgid "before start of appointment"
+#~ msgstr "Crea una nova cita"
+
+#, fuzzy
+#~ msgid "after start of appointment"
+#~ msgstr "Crea una nova cita"
+
+#, fuzzy
+#~ msgid "before end of appointment"
+#~ msgstr "Recorda'm totes les cites"
+
+#, fuzzy
+#~ msgid "Evolution Shortcuts"
+#~ msgstr "Barra de _dreceres de l'Evolution"
+
+#, fuzzy
+#~ msgid "Each account must have a different name."
+#~ msgstr "l'hora actual"
+
+#, fuzzy
+#~ msgid "Delete folder '%s'"
+#~ msgstr "Suprimeix la tasca"
+
+#, fuzzy
+#~ msgid "Rename"
+#~ msgstr "Nom de la regla: "
+
+#, fuzzy
+#~ msgid "_Import File..."
+#~ msgstr "_Insereix el fitxer de text... (FIXME)"
 
 #, fuzzy
 #~ msgid "Factory for the Evolution addressbook component."
@@ -15387,9 +15585,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Renaming old folder and opening"
 #~ msgstr "S'est� canviant el nom de la carpeta antiga i obrint-la"
 
-#~ msgid "Copying messages"
-#~ msgstr "C�pia de missatges"
-
 #, fuzzy
 #~ msgid "Evolution progress"
 #~ msgstr "Evolution"
@@ -15987,10 +16182,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "Copia els missatges des de \"%s\" cap a \"%s\""
 
 #, fuzzy
-#~ msgid "Loading %s Folder for %s"
-#~ msgstr "S'est� carregant la carpeta %s"
-
-#, fuzzy
 #~ msgid "Load %s Folder for %s"
 #~ msgstr "Carrega la carpeta %s"
 
@@ -16555,9 +16746,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Creating \"%s\""
 #~ msgstr "S'est� creant \"%s\""
 
-#~ msgid "Create \"%s\""
-#~ msgstr "Crea \"%s\""
-
 #~ msgid "Exception while reporting result to shell component listener."
 #~ msgstr ""
 #~ "Excepci� en informar del resultat a l'escoltador de components de "
@@ -16764,9 +16952,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "New appointment for _today..."
 #~ msgstr "Nova cita per a _avui..."
 
-#~ msgid "%s%s"
-#~ msgstr "%2$s%1$s"
-
 #~ msgid "'s calendar"
 #~ msgstr "seva agenda"
 
diff --git a/po/da.po b/po/da.po
index e59b09eb86..7a72edf79a 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution beta\n"
-"POT-Creation-Date: 2001-09-21 18:31-0400\n"
+"POT-Creation-Date: 2001-10-01 19:06-0400\n"
 "PO-Revision-Date: 2001-04-21 10:38+0100\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -32,293 +32,293 @@ msgid "Name"
 msgstr "Navn"
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#, fuzzy
-msgid "Family Name"
-msgstr "Fuldt navn"
-
-#: addressbook/backend/ebook/e-card-simple.c:61
 #: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Email"
 msgstr "Epost"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:61
 #: addressbook/gui/contact-editor/e-contact-editor.c:1609
 msgid "Primary"
 msgstr "Prim�r epost"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:61
 #, fuzzy
 msgid "Prim"
 msgstr "Prim�r epost"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:92
 #: addressbook/gui/contact-editor/e-contact-editor.c:1594
 #: addressbook/gui/widgets/e-addressbook-view.c:902
 msgid "Assistant"
 msgstr "Sekret�r"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/gui/contact-editor/e-contact-editor.c:1595
 #: addressbook/gui/contact-editor/e-contact-editor.c:1662
 msgid "Business"
 msgstr "Arbejde"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/backend/ebook/e-card-simple.c:68
 #, fuzzy
 msgid "Bus"
 msgstr "Optaget"
 
-#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/gui/contact-editor/e-contact-editor.c:1598
 msgid "Callback"
 msgstr "Tilbagering"
 
-#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/gui/contact-editor/e-contact-editor.c:1600
 msgid "Company"
 msgstr "Firma"
 
-#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:65
 #, fuzzy
 msgid "Comp"
 msgstr "Kopi�r"
 
-#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:69
 #: addressbook/gui/contact-editor/e-contact-editor.c:1601
 #: addressbook/gui/contact-editor/e-contact-editor.c:1663
 msgid "Home"
 msgstr "Hjem"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:67
 #: addressbook/gui/widgets/e-addressbook-view.c:877
 msgid "Organization"
 msgstr "Organisation"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:67
 #, fuzzy
 msgid "Org"
 msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/e-contact-editor.c:1605
 msgid "Mobile"
 msgstr "_Mobil"
 
-#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/e-contact-editor.c:1599
 msgid "Car"
 msgstr "Bil"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/e-contact-editor.c:1597
 #: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "Business Fax"
 msgstr "Firma fax"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/backend/ebook/e-card-simple.c:72
 #, fuzzy
 msgid "Bus Fax"
 msgstr "Firma fax"
 
-#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/backend/ebook/e-card-simple.c:73
 #: addressbook/gui/contact-editor/e-contact-editor.c:1603
 #: addressbook/gui/widgets/e-addressbook-view.c:883
 msgid "Home Fax"
 msgstr "Hjemme fax"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/e-contact-editor.c:1596
 msgid "Business 2"
 msgstr "Arbejde 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/backend/ebook/e-card-simple.c:74
 #, fuzzy
 msgid "Bus 2"
 msgstr "Optaget"
 
-#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/backend/ebook/e-card-simple.c:75
 #: addressbook/gui/contact-editor/e-contact-editor.c:1602
 msgid "Home 2"
 msgstr "Hjem 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/backend/ebook/e-card-simple.c:76
 #: addressbook/gui/contact-editor/e-contact-editor.c:1604
 #: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "ISDN"
 msgstr "Isdn"
 
-#: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/backend/ebook/e-card-simple.c:83
 #: addressbook/gui/contact-editor/e-contact-editor.c:1606
 #: addressbook/gui/contact-editor/e-contact-editor.c:1664
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:52
 msgid "Other"
 msgstr "Andet"
 
-#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/backend/ebook/e-card-simple.c:78
 #: addressbook/gui/contact-editor/e-contact-editor.c:1607
 #: addressbook/gui/widgets/e-addressbook-view.c:888
 msgid "Other Fax"
 msgstr "Anden fax"
 
-#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/gui/contact-editor/e-contact-editor.c:1608
 #: addressbook/gui/widgets/e-addressbook-view.c:889
 msgid "Pager"
 msgstr "Kalder"
 
-#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/backend/ebook/e-card-simple.c:80
 #: addressbook/gui/contact-editor/e-contact-editor.c:1610
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/backend/ebook/e-card-simple.c:81
 #: addressbook/gui/contact-editor/e-contact-editor.c:1611
 #: addressbook/gui/widgets/e-addressbook-view.c:891
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/backend/ebook/e-card-simple.c:82
 #: addressbook/gui/widgets/e-addressbook-view.c:892
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/backend/ebook/e-card-simple.c:84
 #: addressbook/gui/component/e-address-popup.c:476
 #: addressbook/gui/contact-editor/e-contact-editor.c:1637
 #: addressbook/gui/widgets/e-addressbook-view.c:894
 msgid "Email 2"
 msgstr "Sekund�r epost"
 
-#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/backend/ebook/e-card-simple.c:85
 #: addressbook/gui/component/e-address-popup.c:486
 #: addressbook/gui/contact-editor/e-contact-editor.c:1638
 #: addressbook/gui/widgets/e-addressbook-view.c:895
 msgid "Email 3"
 msgstr "Terti�r epost"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/widgets/e-addressbook-view.c:896
 msgid "Web Site"
 msgstr "Websted"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:86
 msgid "Url"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/widgets/e-addressbook-view.c:897
 msgid "Department"
 msgstr "Afdeling"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:87
 msgid "Dep"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/backend/ebook/e-card-simple.c:88
 #: addressbook/gui/widgets/e-addressbook-view.c:898
 msgid "Office"
 msgstr "Kontor"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/backend/ebook/e-card-simple.c:88
 #, fuzzy
 msgid "Off"
 msgstr "Kontor"
 
-#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card-simple.c:89
 #: addressbook/gui/widgets/e-addressbook-view.c:899
 msgid "Title"
 msgstr "Titel"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:90
 #: addressbook/gui/widgets/e-addressbook-view.c:900
 msgid "Profession"
 msgstr "Profession"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Prof"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:91
 #: addressbook/gui/widgets/e-addressbook-view.c:901
 msgid "Manager"
 msgstr "Foresatte"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:91
 #, fuzzy
 msgid "Man"
 msgstr "maj"
 
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:92
 msgid "Ass"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card-simple.c:93
 #: addressbook/gui/widgets/e-addressbook-view.c:903
 msgid "Nickname"
 msgstr "Kaldenavn"
 
-#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card-simple.c:93
 #, fuzzy
 msgid "Nick"
 msgstr "Kaldenavn"
 
-#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/backend/ebook/e-card-simple.c:94
 #: addressbook/gui/widgets/e-addressbook-view.c:904
 msgid "Spouse"
 msgstr "Samlever"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card-simple.c:95
 #: addressbook/gui/widgets/e-addressbook-view.c:905
 msgid "Note"
 msgstr "Bem�rkning"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:96
 #, fuzzy
 msgid "Calendar URI"
 msgstr "Kalender"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:96
 msgid "CALUri"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:97
 #: addressbook/gui/widgets/e-addressbook-view.c:906
 msgid "Free-busy URL"
 msgstr "Ledig-optaget URL"
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:97
 msgid "FBUrl"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:98
 #, fuzzy
 msgid "Anniversary"
 msgstr "Br_yllupsdag:"
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "Anniv"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card-simple.c:99
 #, fuzzy
 msgid "Birth Date"
 msgstr ""
 "\n"
 "F�dselsdato: "
 
-#: addressbook/backend/ebook/e-card-simple.c:103
+#: addressbook/backend/ebook/e-card-simple.c:102
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "Kategorier"
 
+#: addressbook/backend/ebook/e-card-simple.c:103
+#, fuzzy
+msgid "Family Name"
+msgstr "Fuldt navn"
+
 #: addressbook/backend/ebook/e-card.c:3564
 msgid "Card: "
 msgstr "Kort: "
@@ -618,10 +618,10 @@ msgstr "VKort for %s"
 #: 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:1119
+#: addressbook/conduit/address-conduit.c:1167
 #: addressbook/gui/component/addressbook-factory.c:48
-#: calendar/conduits/calendar/calendar-conduit.c:1204
-#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/conduits/calendar/calendar-conduit.c:1262
+#: calendar/conduits/todo/todo-conduit.c:1034
 #: calendar/gui/alarm-notify/notify-main.c:78 calendar/gui/main.c:63
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikke initiere Bonobo"
@@ -694,20 +694,20 @@ msgstr "Mark�ren kunne ikke indl�ses\n"
 msgid "EBook not loaded\n"
 msgstr "EBook ikke indl�st\n"
 
-#: addressbook/conduit/address-conduit.c:681
-#: calendar/conduits/calendar/calendar-conduit.c:778
-#: calendar/conduits/todo/todo-conduit.c:592
+#: addressbook/conduit/address-conduit.c:731
+#: calendar/conduits/calendar/calendar-conduit.c:837
+#: calendar/conduits/todo/todo-conduit.c:609
 msgid "Could not start wombat server"
 msgstr "Kunne ikke starte wombat-tjener"
 
-#: addressbook/conduit/address-conduit.c:682
-#: calendar/conduits/calendar/calendar-conduit.c:779
-#: calendar/conduits/todo/todo-conduit.c:593
+#: addressbook/conduit/address-conduit.c:732
+#: calendar/conduits/calendar/calendar-conduit.c:838
+#: calendar/conduits/todo/todo-conduit.c:610
 msgid "Could not start wombat"
 msgstr "Kunne ikke starte wombat"
 
-#: addressbook/conduit/address-conduit.c:714
-#: addressbook/conduit/address-conduit.c:717
+#: addressbook/conduit/address-conduit.c:762
+#: addressbook/conduit/address-conduit.c:765
 msgid "Could not read pilot's Address application block"
 msgstr "Kunne ikke l�se pilotens adresseapplikationsblok"
 
@@ -752,8 +752,8 @@ msgid "Factory for the sample Addressbook control"
 msgstr "Fabrik for eksempelkontrol for adressebog"
 
 #: addressbook/gui/component/addressbook-component.c:66
-#: calendar/gui/dialogs/comp-editor-util.c:281
-#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:173
+#: calendar/gui/dialogs/comp-editor-util.c:289
+#: calendar/gui/dialogs/comp-editor-util.c:345 shell/e-local-storage.c:173
 #: shell/e-shortcuts.c:1062
 #, fuzzy
 msgid "Contacts"
@@ -777,23 +777,23 @@ msgstr ""
 "Fejl ved indl�sning af filter information:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-component.c:386
+#: addressbook/gui/component/addressbook-component.c:411
 #: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "New Contact"
 msgstr "Ny kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:386
+#: addressbook/gui/component/addressbook-component.c:411
 #, fuzzy
 msgid "New _Contact"
 msgstr "Ny kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:387
+#: addressbook/gui/component/addressbook-component.c:412
 #, fuzzy
 msgid "New Contact List"
 msgstr "Ny kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:387
+#: addressbook/gui/component/addressbook-component.c:412
 #, fuzzy
 msgid "New Contact _List"
 msgstr "Ny kontakt"
@@ -903,19 +903,19 @@ msgid "_Account name:"
 msgstr "Kontoadministration"
 
 #: addressbook/gui/component/addressbook-config.glade.h:22
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: 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:90 my-evolution/my-evolution.glade.h:20
+#: mail/mail-config.glade.h:91 my-evolution/my-evolution.glade.h:20
 msgid "_Add"
 msgstr "_Tilf�j"
 
 #: addressbook/gui/component/addressbook-config.glade.h:23
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:95
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:96
 #: ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
 #: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
 msgstr "_Redig�r"
@@ -939,37 +939,37 @@ msgstr "Tjenertype:"
 msgid "Other Contacts"
 msgstr "Andre kontakter"
 
-#: addressbook/gui/component/addressbook.c:393
+#: addressbook/gui/component/addressbook.c:407
 #, fuzzy, c-format
 msgid "Please enter your email address and password for access to %s"
 msgstr "Indtast venligst din %s adgangskode for %s"
 
-#: addressbook/gui/component/addressbook.c:401
+#: addressbook/gui/component/addressbook.c:415
 #, fuzzy
 msgid "LDAP Authentication"
 msgstr "Godkendelse"
 
-#: addressbook/gui/component/addressbook.c:412
+#: addressbook/gui/component/addressbook.c:426
 msgid "Email Address:"
 msgstr "Epostadresse:"
 
-#: addressbook/gui/component/addressbook.c:425
+#: addressbook/gui/component/addressbook.c:439
 #, fuzzy
 msgid "Password:"
 msgstr "Adgangskode"
 
-#: addressbook/gui/component/addressbook.c:488
+#: addressbook/gui/component/addressbook.c:502
 msgid "Unable to open addressbook"
 msgstr "Kunne ikke �bne adressebogen"
 
-#: addressbook/gui/component/addressbook.c:495
+#: addressbook/gui/component/addressbook.c:509
 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:500
+#: addressbook/gui/component/addressbook.c:514
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -977,45 +977,45 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:508
+#: addressbook/gui/component/addressbook.c:522
 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:649
+#: addressbook/gui/component/addressbook.c:663
 #: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "Hvilkensomhelst felt indeholder"
 
-#: addressbook/gui/component/addressbook.c:650
+#: addressbook/gui/component/addressbook.c:664
 msgid "Name contains"
 msgstr "Navn indeholder"
 
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:665
 msgid "Email contains"
 msgstr "Epost indeholder"
 
-#: addressbook/gui/component/addressbook.c:652
+#: addressbook/gui/component/addressbook.c:666
 #: calendar/gui/cal-search-bar.c:59
 #, fuzzy
 msgid "Category is"
 msgstr "Kategorier"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:653 widgets/misc/e-filter-bar.h:97
+#: addressbook/gui/component/addressbook.c:667 widgets/misc/e-filter-bar.h:97
 #: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "Avanceret..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:883
+#: addressbook/gui/component/addressbook.c:897
 #: calendar/gui/cal-search-bar.c:412
 #, fuzzy
 msgid "Any Category"
 msgstr "Kategori:"
 
-#: addressbook/gui/component/addressbook.c:925
+#: addressbook/gui/component/addressbook.c:939
 msgid "The URI that the Folder Browser will display"
 msgstr "Uri'en som mappebladreren vil vise"
 
@@ -1030,7 +1030,7 @@ msgid "(none)"
 msgstr "(Uden navn)"
 
 #: addressbook/gui/component/e-address-popup.c:466
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #: addressbook/gui/contact-editor/e-contact-editor.c:1636
 msgid "Primary Email"
 msgstr "Prim�r epost"
@@ -1210,120 +1210,127 @@ msgstr "Detaljer"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
 #, fuzzy
+msgid "F_ree/Busy URL:"
+msgstr "Ledig-optaget URL"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#, fuzzy
 msgid "File A_s:"
 msgstr "Gem som:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "General"
 msgstr "Generel"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+msgid ""
+"If this person publishes free/busy or other calendar information on the "
+"Internet, enter the address\n"
+"of that information here."
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "New phone type"
 msgstr "Ny telefontype"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "No_tes:"
 msgstr "_Notater:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #, fuzzy
 msgid "Organi_zation:"
 msgstr "Organisation:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "Phone Types"
 msgstr "Telefontyper"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "Wants to receive _HTML mail"
 msgstr "Vil modtage epost af formatet _HTML"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Address..."
 msgstr "_Adresse..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "_Assistant's name:"
 msgstr "Sekret�rs navn:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Birthday:"
 msgstr "_F�dselsdag:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Business"
 msgstr "_Arbejde"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#, fuzzy
-msgid "_Calendar Information:"
-msgstr "Kalenderinformation"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 #: calendar/gui/dialogs/event-page.glade.h:12
 #: calendar/gui/dialogs/task-page.glade.h:10
 msgid "_Contacts..."
 msgstr "_Kontakter..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:834 filter/filter.glade.h:8
-#: mail/folder-browser.c:1371 mail/mail-config.glade.h:94
+#: mail/folder-browser.c:1406 mail/mail-config.glade.h:95
 #: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "_Slet"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Department:"
 msgstr "_Afdeling:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#, fuzzy
-msgid "_Free/Busy Information:"
-msgstr "Ingen information"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Full Name..."
 msgstr "_Fulde navn..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Home"
 msgstr "_Hjemme"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Job title:"
 msgstr "_Job titel:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Manager's Name:"
 msgstr "_Leders navn:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Mobile"
 msgstr "_Mobil"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Nickname:"
 msgstr "Kalde_navn:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Office:"
 msgstr "_Kontor:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Profession:"
 msgstr "_Profession:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#, fuzzy
+msgid "_Public Calendar URL:"
+msgstr "Kalender"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Spouse:"
 msgstr "�gte_f�lle:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_This is the mailing address"
 msgstr "_Dette er postadressen"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "_Web page address:"
 msgstr "Hjemmeside-adresse:"
@@ -2588,7 +2595,7 @@ msgstr " %d sekunder"
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
 #: addressbook/gui/widgets/e-addressbook-view.c:691
 #: addressbook/gui/widgets/e-addressbook-view.c:753
-#: addressbook/gui/widgets/e-addressbook-view.c:1373
+#: addressbook/gui/widgets/e-addressbook-view.c:1422
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Gem som vCard"
@@ -2647,8 +2654,8 @@ msgid "Success"
 msgstr "Kilder"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1710
-#: shell/e-storage.c:515
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1702
+#: shell/e-storage.c:520
 msgid "Unknown error"
 msgstr "Ukendt fejl"
 
@@ -2657,7 +2664,7 @@ msgstr "Ukendt fejl"
 msgid "Repository offline"
 msgstr "Arbejd uden net"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:505
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:510
 msgid "Permission denied"
 msgstr "Adgang n�gtet"
 
@@ -2676,10 +2683,10 @@ msgid "Protocol not supported"
 msgstr "Operationen er ikke underst�ttet"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:733 calendar/gui/calendar-model.c:1274
+#: calendar/gui/calendar-model.c:726 calendar/gui/calendar-model.c:1247
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:544
-#: camel/camel-service.c:580
+#: calendar/gui/e-calendar-table.c:461 camel/camel-service.c:598
+#: camel/camel-service.c:634
 msgid "Cancelled"
 msgstr "Afbrudt"
 
@@ -2709,7 +2716,7 @@ msgid "Error removing list"
 msgstr "Fejl under indl�sning af %s"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1248
+#: addressbook/gui/widgets/e-addressbook-view.c:1297
 #, fuzzy
 msgid "Error removing card"
 msgstr "Fejl under indl�sning af %s"
@@ -2997,8 +3004,8 @@ msgstr "Skrifttype..."
 msgid "Print cards"
 msgstr "Udskriv kalender"
 
-#: addressbook/printing/e-contact-print.c:1112
-#: addressbook/printing/e-contact-print.c:1134
+#: addressbook/printing/e-contact-print.c:1152
+#: addressbook/printing/e-contact-print.c:1174
 #, fuzzy
 msgid "Print card"
 msgstr "Udskriv kalender"
@@ -3009,18 +3016,44 @@ msgstr "Udskriv kalender"
 msgid "Print envelope"
 msgstr "Skriv kuvert..."
 
-#: calendar/conduits/calendar/calendar-conduit.c:735
-#: calendar/conduits/todo/todo-conduit.c:548
+#: calendar/cal-util/cal-util.c:418 calendar/cal-util/cal-util.c:440
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:385 mail/message-list.c:652
+msgid "High"
+msgstr "H�j"
+
+#: calendar/cal-util/cal-util.c:420 calendar/cal-util/cal-util.c:442
+#: calendar/gui/calendar-model.c:1673
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:386 mail/message-list.c:651
+msgid "Normal"
+msgstr "Normal"
+
+#: calendar/cal-util/cal-util.c:422 calendar/cal-util/cal-util.c:444
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:387 mail/message-list.c:650
+msgid "Low"
+msgstr "Lav"
+
+#. An empty string is the same as 'None'.
+#: calendar/cal-util/cal-util.c:438
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:388
+msgid "Undefined"
+msgstr "Udefineret"
+
+#: calendar/conduits/calendar/calendar-conduit.c:793
+#: calendar/conduits/todo/todo-conduit.c:564
 msgid "Error while communicating with calendar server"
 msgstr "Fejl under kommunikation med kalendertjeneren"
 
-#: calendar/conduits/calendar/calendar-conduit.c:839
-#: calendar/conduits/calendar/calendar-conduit.c:842
+#: calendar/conduits/calendar/calendar-conduit.c:896
+#: calendar/conduits/calendar/calendar-conduit.c:899
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kunne ikke l�se pilotens kalenderapplikationsblok"
 
-#: calendar/conduits/todo/todo-conduit.c:653
-#: calendar/conduits/todo/todo-conduit.c:656
+#: calendar/conduits/todo/todo-conduit.c:668
+#: calendar/conduits/todo/todo-conduit.c:671
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunne ikke l�se pilotens applikationsblok for opgaveliste"
 
@@ -3070,47 +3103,47 @@ msgstr "Alarm-notificeringstjeneste"
 msgid "Factory for the alarm notification service"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:152
 #, fuzzy, c-format
 msgid "Notification about your appointment starting on %s and ending on %s"
 msgstr "Besked om din aftale p� %A %d %b %Y %H:%M"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:156
 #, fuzzy, c-format
 msgid "Notification about your appointment starting on %s"
 msgstr "Besked om din aftale p� %A %d %b %Y %H:%M"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:161
 #, fuzzy, c-format
 msgid "Notification about your appointment ending on %s"
 msgstr "Besked om din aftale p� %A %d %b %Y %H:%M"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:165
 #, fuzzy
 msgid "Notification about your appointment"
 msgstr "Besked om din aftale p� %A %d %b %Y %H:%M"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:172
 #, fuzzy, c-format
 msgid "Notification about your task starting on %s and ending on %s"
 msgstr "Besked om din aftale p� %A %d %b %Y %H:%M"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:176
 #, fuzzy, c-format
 msgid "Notification about your task starting on %s"
 msgstr "Besked om din aftale p� %A %d %b %Y %H:%M"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:181
 #, fuzzy, c-format
 msgid "Notification about your task ending on %s"
 msgstr "Besked om din aftale p� %A %d %b %Y %H:%M"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:185
 #, fuzzy
 msgid "Notification about your task"
 msgstr "Vis information om Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:267
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "Alarm p� %A %d %b %Y %H:%M"
 
@@ -3199,7 +3232,7 @@ msgstr "%A den %e. %B %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: calendar/gui/calendar-commands.c:467
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1442
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1446
 msgid "%d %B"
 msgstr "%d %b"
 
@@ -3210,17 +3243,17 @@ msgstr ""
 "Kunne ikke oprette kalender-visning. Tjek venligst din ops�tning af ORBit og "
 "OAF."
 
-#: calendar/gui/calendar-model.c:399 calendar/gui/calendar-model.c:1001
-#: calendar/gui/e-calendar-table.c:307
+#: calendar/gui/calendar-model.c:399 calendar/gui/calendar-model.c:994
+#: calendar/gui/e-calendar-table.c:364
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:1003
-#: calendar/gui/e-calendar-table.c:308
+#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:996
+#: calendar/gui/e-calendar-table.c:365
 msgid "Confidential"
 msgstr "_Fortrolig"
 
-#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:306
+#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:363
 msgid "Public"
 msgstr "Of_fentlig"
 
@@ -3240,68 +3273,49 @@ msgstr "�"
 msgid "W"
 msgstr "V"
 
-#: calendar/gui/calendar-model.c:538 calendar/gui/calendar-model.c:1183
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:652
-msgid "High"
-msgstr "H�j"
-
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1185
-#: calendar/gui/calendar-model.c:1700
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:651
-msgid "Normal"
-msgstr "Normal"
-
-#: calendar/gui/calendar-model.c:542 calendar/gui/calendar-model.c:1187
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:650
-msgid "Low"
-msgstr "Lav"
-
-#: calendar/gui/calendar-model.c:573 calendar/gui/calendar-model.c:1220
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/calendar-model.c:566 calendar/gui/calendar-model.c:1193
+#: calendar/gui/e-calendar-table.c:437
 #, fuzzy
 msgid "Free"
 msgstr "uge"
 
-#: calendar/gui/calendar-model.c:575 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/calendar-model.c:568 calendar/gui/e-calendar-table.c:438
 #: calendar/gui/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr "Optaget"
 
-#: calendar/gui/calendar-model.c:724 calendar/gui/calendar-model.c:1268
+#: calendar/gui/calendar-model.c:717 calendar/gui/calendar-model.c:1241
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:401
+#: calendar/gui/e-calendar-table.c:458
 msgid "Not Started"
 msgstr "Ikke startet"
 
-#: calendar/gui/calendar-model.c:727 calendar/gui/calendar-model.c:1270
+#: calendar/gui/calendar-model.c:720 calendar/gui/calendar-model.c:1243
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:402
+#: calendar/gui/e-calendar-table.c:459
 msgid "In Progress"
 msgstr "Under udarbejdelse"
 
-#: calendar/gui/calendar-model.c:730 calendar/gui/calendar-model.c:1272
+#: calendar/gui/calendar-model.c:723 calendar/gui/calendar-model.c:1245
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-meeting-model.c:298
+#: calendar/gui/e-calendar-table.c:460 calendar/gui/e-meeting-model.c:298
 #: calendar/gui/e-meeting-model.c:321
 msgid "Completed"
 msgstr "Fuldf�rt"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:915 e-util/e-time-utils.c:163
+#: calendar/gui/calendar-model.c:908 e-util/e-time-utils.c:163
 #: e-util/e-time-utils.c:354
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %Y-%m-%d %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:918 e-util/e-time-utils.c:158
+#: calendar/gui/calendar-model.c:911 e-util/e-time-utils.c:158
 #: e-util/e-time-utils.c:363
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %Y-%m-%d %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:923
+#: calendar/gui/calendar-model.c:916
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -3312,7 +3326,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:1087
+#: calendar/gui/calendar-model.c:1080
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3322,47 +3336,36 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1127
+#: calendar/gui/calendar-model.c:1120
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Procentv�rdien skal v�re mellem 0 og 100, inklusive"
 
-#: calendar/gui/calendar-model.c:1168
-msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
-msgstr "Prioriteten skal v�re en af 'H�j', 'Normal', 'Lav' eller 'Udefineret'."
-
-#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1181
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:331
-msgid "Undefined"
-msgstr "Udefineret"
-
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1266 calendar/gui/dialogs/meeting-page.c:332
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1444
+#: calendar/gui/calendar-model.c:1239 calendar/gui/dialogs/meeting-page.c:332
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1446
 #: mail/mail-accounts.c:143 mail/mail-accounts.c:390
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:50
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:203
-#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
-#: widgets/misc/e-dateedit.c:1428 widgets/misc/e-dateedit.c:1543
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:453
+#: widgets/misc/e-dateedit.c:1453 widgets/misc/e-dateedit.c:1568
 msgid "None"
 msgstr "Ingen"
 
-#: calendar/gui/calendar-model.c:1702
+#: calendar/gui/calendar-model.c:1675
 msgid "Recurring"
 msgstr "Gentages"
 
-#: calendar/gui/calendar-model.c:1704
+#: calendar/gui/calendar-model.c:1677
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: calendar/gui/calendar-model.c:1710 calendar/gui/e-meeting-model.c:270
+#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:270
 #: calendar/gui/e-meeting-model.c:280 calendar/gui/e-meeting-model.c:506
 #: calendar/gui/e-meeting-model.c:702
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1710 calendar/gui/e-meeting-model.c:282
+#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:282
 #: calendar/gui/e-meeting-model.c:703
 msgid "No"
 msgstr "Nej"
@@ -3405,42 +3408,42 @@ msgstr "Navn indeholder"
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/component-factory.c:62 my-evolution/my-evolution.glade.h:6
+#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:6
 #: shell/e-local-storage.c:172 shell/e-shortcuts.c:1056
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/gui/component-factory.c:63
+#: calendar/gui/component-factory.c:64
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/component-factory.c:67 calendar/gui/print.c:1719
-#: my-evolution/e-summary-tasks.c:215 my-evolution/e-summary-tasks.c:231
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1723
+#: my-evolution/e-summary-tasks.c:237 my-evolution/e-summary-tasks.c:253
 #: shell/e-local-storage.c:178 shell/e-shortcuts.c:1059
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Opgaver"
 
-#: calendar/gui/component-factory.c:68
+#: calendar/gui/component-factory.c:69
 #, fuzzy
 msgid "Folder containing to-do items"
 msgstr "vMappe efter diskussionsliste"
 
-#: calendar/gui/component-factory.c:593 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:581 ui/evolution-calendar.xml.h:7
 msgid "Create a new appointment"
 msgstr "Opret en ny aftale"
 
-#: calendar/gui/component-factory.c:594 calendar/gui/e-day-view.c:3420
+#: calendar/gui/component-factory.c:582 calendar/gui/e-day-view.c:3422
 #, fuzzy
 msgid "New _Appointment"
 msgstr "Ny aftale"
 
-#: calendar/gui/component-factory.c:599 ui/evolution-calendar.xml.h:8
+#: calendar/gui/component-factory.c:587 ui/evolution-calendar.xml.h:8
 #: ui/evolution-tasks.xml.h:5
 msgid "Create a new task"
 msgstr "Opret en ny opgave"
 
-#: calendar/gui/component-factory.c:600
+#: calendar/gui/component-factory.c:588
 #, fuzzy
 msgid "New _Task"
 msgstr "Ny opgave"
@@ -3523,105 +3526,126 @@ msgstr "timer"
 msgid "minutes"
 msgstr "minutter"
 
-#: calendar/gui/dialogs/alarm-page.c:303
+#: calendar/gui/dialogs/alarm-page.c:307
 #, fuzzy, c-format
 msgid "%d days"
 msgstr " %d dage"
 
-#: calendar/gui/dialogs/alarm-page.c:305
+#: calendar/gui/dialogs/alarm-page.c:310
 #, fuzzy
 msgid "1 day"
 msgstr " 1 dag"
 
-#: calendar/gui/dialogs/alarm-page.c:308
+#: calendar/gui/dialogs/alarm-page.c:315
 #, fuzzy, c-format
 msgid "%d weeks"
 msgstr " %d uger"
 
-#: calendar/gui/dialogs/alarm-page.c:310
+#: calendar/gui/dialogs/alarm-page.c:318
 #, fuzzy
 msgid "1 week"
 msgstr " 1 uge"
 
-#: calendar/gui/dialogs/alarm-page.c:313
+#: calendar/gui/dialogs/alarm-page.c:323
 #, fuzzy, c-format
 msgid "%d hours"
 msgstr " %d timer"
 
-#: calendar/gui/dialogs/alarm-page.c:315
+#: calendar/gui/dialogs/alarm-page.c:326
 #, fuzzy
 msgid "1 hour"
 msgstr " 1 time"
 
-#: calendar/gui/dialogs/alarm-page.c:318
+#: calendar/gui/dialogs/alarm-page.c:331
 #, fuzzy, c-format
 msgid "%d minutes"
 msgstr " %d minutter"
 
-#: calendar/gui/dialogs/alarm-page.c:320
+#: calendar/gui/dialogs/alarm-page.c:334
 #, fuzzy
 msgid "1 minute"
 msgstr " 1 minut"
 
-#: calendar/gui/dialogs/alarm-page.c:323
+#: calendar/gui/dialogs/alarm-page.c:339
 #, fuzzy, c-format
 msgid "%d seconds"
 msgstr " %d sekunder"
 
-#: calendar/gui/dialogs/alarm-page.c:325
+#: calendar/gui/dialogs/alarm-page.c:342
 #, fuzzy
 msgid "1 second"
 msgstr " 1 sekund"
 
-#: calendar/gui/dialogs/alarm-page.c:350
+#: calendar/gui/dialogs/alarm-page.c:373
 #: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "Afspil lyd/sang"
 
-#: calendar/gui/dialogs/alarm-page.c:354
+#: calendar/gui/dialogs/alarm-page.c:377
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 #, fuzzy
 msgid "Display a message"
 msgstr "den aktuelle tid"
 
-#: calendar/gui/dialogs/alarm-page.c:358
+#: calendar/gui/dialogs/alarm-page.c:381
 msgid "Send an email"
 msgstr "Send besked"
 
-#: calendar/gui/dialogs/alarm-page.c:362
+#: calendar/gui/dialogs/alarm-page.c:385
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "K�_r program"
 
-#: calendar/gui/dialogs/alarm-page.c:368 calendar/gui/dialogs/alarm-page.c:404
-#: calendar/gui/e-meeting-model.c:226 calendar/gui/e-meeting-model.c:261
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:674
-#: calendar/gui/e-meeting-model.c:690
-#: camel/providers/smtp/camel-smtp-transport.c:224
-#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
-msgid "Unknown"
+#: calendar/gui/dialogs/alarm-page.c:391
+#, fuzzy
+msgid "Unknown action to be performed"
 msgstr "Ukendt fejl"
 
-#: calendar/gui/dialogs/alarm-page.c:380
-#, fuzzy
-msgid "before start of appointment"
+#: calendar/gui/dialogs/alarm-page.c:403
+#, fuzzy, c-format
+msgid "%s %s before the start of the appointment"
 msgstr " f�r begyndelse p� aftale"
 
-#: calendar/gui/dialogs/alarm-page.c:383
-#, fuzzy
-msgid "after start of appointment"
-msgstr " efter begyndelse p� aftale"
+#: calendar/gui/dialogs/alarm-page.c:406
+#, fuzzy, c-format
+msgid "%s %s after the start of the appointment"
+msgstr " f�r begyndelse p� aftale"
 
-#: calendar/gui/dialogs/alarm-page.c:393
-#, fuzzy
-msgid "before end of appointment"
-msgstr " f�r slutning p� aftale"
+#: calendar/gui/dialogs/alarm-page.c:411
+#, fuzzy, c-format
+msgid "%s at the start of the appointment"
+msgstr " f�r begyndelse p� aftale"
 
-#: calendar/gui/dialogs/alarm-page.c:396
-#, fuzzy
-msgid "after end of appointment"
+#: calendar/gui/dialogs/alarm-page.c:420
+#, fuzzy, c-format
+msgid "%s %s before the end of the appointment"
+msgstr " f�r begyndelse p� aftale"
+
+#: calendar/gui/dialogs/alarm-page.c:423
+#, fuzzy, c-format
+msgid "%s %s after the end of the appointment"
 msgstr " efter slutning p� aftale"
 
+#: calendar/gui/dialogs/alarm-page.c:428
+#, fuzzy, c-format
+msgid "%s at the end of the appointment"
+msgstr " efter slutning p� aftale"
+
+#: calendar/gui/dialogs/alarm-page.c:439
+#, fuzzy, c-format
+msgid "%s at an unknown time"
+msgstr "Ukendt fejl"
+
+#: calendar/gui/dialogs/alarm-page.c:445
+#, fuzzy, c-format
+msgid "%s at %s"
+msgstr "%s-tjener %s"
+
+#: calendar/gui/dialogs/alarm-page.c:452
+#, c-format
+msgid "%s for an unknown trigger type"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 #, fuzzy
@@ -3977,59 +4001,59 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:159 calendar/gui/print.c:2128
+#: calendar/gui/dialogs/comp-editor-util.c:167 calendar/gui/print.c:2132
 #, fuzzy
 msgid " to "
 msgstr "for"
 
-#: calendar/gui/dialogs/comp-editor-util.c:163 calendar/gui/print.c:2132
+#: calendar/gui/dialogs/comp-editor-util.c:171 calendar/gui/print.c:2136
 #, fuzzy
 msgid " (Completed "
 msgstr "Fuldf�rt"
 
-#: calendar/gui/dialogs/comp-editor-util.c:165 calendar/gui/print.c:2134
+#: calendar/gui/dialogs/comp-editor-util.c:173 calendar/gui/print.c:2138
 #, fuzzy
 msgid "Completed "
 msgstr "Fuldf�rt"
 
-#: calendar/gui/dialogs/comp-editor-util.c:170 calendar/gui/print.c:2139
+#: calendar/gui/dialogs/comp-editor-util.c:178 calendar/gui/print.c:2143
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2141
+#: calendar/gui/dialogs/comp-editor-util.c:180 calendar/gui/print.c:2145
 #, fuzzy
 msgid "Due "
 msgstr "F�rdig-dato"
 
-#: calendar/gui/dialogs/comp-editor.c:515
+#: calendar/gui/dialogs/comp-editor.c:521
 msgid "Edit Appointment"
 msgstr "Redig�r aftale"
 
-#: calendar/gui/dialogs/comp-editor.c:520
+#: calendar/gui/dialogs/comp-editor.c:526
 #, c-format
 msgid "Appointment - %s"
 msgstr "Aftale - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:523
+#: calendar/gui/dialogs/comp-editor.c:529
 #, c-format
 msgid "Task - %s"
 msgstr "Opgave - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:526
+#: calendar/gui/dialogs/comp-editor.c:532
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journalpunkt - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:540
+#: calendar/gui/dialogs/comp-editor.c:546
 msgid "No summary"
 msgstr "Ingen sammendrag"
 
-#: calendar/gui/dialogs/comp-editor.c:950 mail/mail-callbacks.c:1662
+#: calendar/gui/dialogs/comp-editor.c:952 mail/mail-callbacks.c:1671
 #: mail/mail-display.c:100
 msgid "Overwrite file?"
 msgstr "Overskriv fil?"
 
-#: calendar/gui/dialogs/comp-editor.c:954 mail/mail-callbacks.c:1668
+#: calendar/gui/dialogs/comp-editor.c:956 mail/mail-callbacks.c:1677
 #: mail/mail-display.c:104
 msgid ""
 "A file by that name already exists.\n"
@@ -4038,53 +4062,53 @@ msgstr ""
 "En fil med samme navn eksisterer allerede.\n"
 "Overskriv den?"
 
-#: calendar/gui/dialogs/comp-editor.c:1017 ui/evolution-comp-editor.xml.h:13
+#: calendar/gui/dialogs/comp-editor.c:1019 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "Gem som..."
 
-#: calendar/gui/dialogs/comp-editor.c:1170
+#: calendar/gui/dialogs/comp-editor.c:1172
 msgid "Unable to obtain current version!"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:90
+#: calendar/gui/dialogs/delete-comp.c:91
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Er du sikker p� at du vil slette aftalen '%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:93
+#: calendar/gui/dialogs/delete-comp.c:94
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Er du sikker p� at du vil slette denne unavngivne aftale?"
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:100
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Er du sikker p� at du vil slette opgaven '%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:102
+#: calendar/gui/dialogs/delete-comp.c:103
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Er du sikker p� at du vil slette denne unavngivne opgave?"
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:109
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Er du sikker p� at du vil slette journalindgangen '%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:111
+#: calendar/gui/dialogs/delete-comp.c:112
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Er du sikker p� at du vil slette denne unavngivne journalindgang?"
 
-#: calendar/gui/dialogs/delete-comp.c:126
+#: calendar/gui/dialogs/delete-comp.c:127
 #, fuzzy, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Er du sikker p� at du vil slette aftalen '%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:131
+#: calendar/gui/dialogs/delete-comp.c:132
 #, fuzzy, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Er du sikker p� at du vil slette opgaven '%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:136
+#: calendar/gui/dialogs/delete-comp.c:137
 #, fuzzy, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Er du sikker p� at du vil slette journalindgangen '%s'?"
@@ -4285,7 +4309,7 @@ msgstr "Status"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:18
-#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:85
+#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:86
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Type"
@@ -4310,8 +4334,8 @@ msgstr "_Indvit�r andre..."
 msgid "_Other Organizer"
 msgstr "Arrang�r:"
 
-#: calendar/gui/dialogs/recurrence-page.c:422 calendar/gui/print.c:1851
-#: calendar/gui/print.c:1853 calendar/gui/print.c:1854
+#: calendar/gui/dialogs/recurrence-page.c:422 calendar/gui/print.c:1855
+#: calendar/gui/print.c:1857 calendar/gui/print.c:1858
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
@@ -4435,7 +4459,7 @@ msgid "Progress"
 msgstr "Fremskridt"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:910
+#: my-evolution/e-summary-preferences.c:949
 msgid "URL:"
 msgstr "URL:"
 
@@ -4455,7 +4479,7 @@ msgstr "Tildelt"
 
 #: calendar/gui/dialogs/task-page.glade.h:4
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:28
 msgid "Description:"
 msgstr "Beskrivelse:"
 
@@ -4471,109 +4495,109 @@ msgstr "_Fortrolig"
 msgid "_Due Date:"
 msgstr "Slut-_dato:"
 
-#: calendar/gui/e-calendar-table.c:350
+#: calendar/gui/e-calendar-table.c:407
 #, c-format
 msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:351
+#: calendar/gui/e-calendar-table.c:408
 #, c-format
 msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:409
 #, c-format
 msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:410
 #, c-format
 msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:411
 #, c-format
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:412
 #, c-format
 msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:356
+#: calendar/gui/e-calendar-table.c:413
 #, c-format
 msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:357
+#: calendar/gui/e-calendar-table.c:414
 #, c-format
 msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:358
+#: calendar/gui/e-calendar-table.c:415
 #, c-format
 msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:359
+#: calendar/gui/e-calendar-table.c:416
 #, c-format
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:360
+#: calendar/gui/e-calendar-table.c:417
 #, c-format
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3441
-#: calendar/gui/e-week-view.c:3288 mail/folder-browser.c:1336
+#: calendar/gui/e-calendar-table.c:914 calendar/gui/e-day-view.c:3443
+#: calendar/gui/e-week-view.c:3296 mail/folder-browser.c:1371
 #: shell/e-shortcuts-view.c:385
 msgid "_Open"
 msgstr "_�bn"
 
-#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3450
-#: calendar/gui/e-week-view.c:3297 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:918 calendar/gui/e-day-view.c:3452
+#: calendar/gui/e-week-view.c:3305 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:856 calendar/gui/e-day-view.c:3452
-#: calendar/gui/e-week-view.c:3299 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:920 calendar/gui/e-day-view.c:3454
+#: calendar/gui/e-week-view.c:3307 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:14
 msgid "_Copy"
 msgstr "_Kopi�r"
 
-#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3427
-#: calendar/gui/e-day-view.c:3454 calendar/gui/e-week-view.c:3275
-#: calendar/gui/e-week-view.c:3301 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:922 calendar/gui/e-day-view.c:3429
+#: calendar/gui/e-day-view.c:3456 calendar/gui/e-week-view.c:3283
+#: calendar/gui/e-week-view.c:3309 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:40 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:17
 msgid "_Paste"
 msgstr "_Inds�t"
 
-#: calendar/gui/e-calendar-table.c:863
+#: calendar/gui/e-calendar-table.c:927
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "Mark�r som fuldf�rt"
 
-#: calendar/gui/e-calendar-table.c:865
+#: calendar/gui/e-calendar-table.c:929
 #, fuzzy
 msgid "_Delete this Task"
 msgstr "Slet denne opgave"
 
-#: calendar/gui/e-calendar-table.c:868
+#: calendar/gui/e-calendar-table.c:932
 #, fuzzy
 msgid "_Mark Tasks as Complete"
 msgstr "Mark�r som fuldf�rt"
 
-#: calendar/gui/e-calendar-table.c:870
+#: calendar/gui/e-calendar-table.c:934
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Slet opgaven"
 
-#: calendar/gui/e-calendar-table.c:1130
+#: calendar/gui/e-calendar-table.c:1194
 #: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Click to add a task"
@@ -4583,8 +4607,8 @@ msgstr "* Klik her for at tilf�je en kontakt *"
 msgid "Alarms"
 msgstr "Alarmer"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:702
-#: camel/camel-filter-driver.c:819
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:718
+#: camel/camel-filter-driver.c:834
 msgid "Complete"
 msgstr "F�rdig"
 
@@ -4615,8 +4639,8 @@ 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:30 shell/e-shortcuts.c:1050
-#: shell/e-storage-set-view.c:1424 shell/e-summary-storage.c:80
+#: my-evolution/component-factory.c:45 shell/e-shortcuts.c:1050
+#: shell/e-storage-set-view.c:1420 shell/e-summary-storage.c:80
 msgid "Summary"
 msgstr "Sammendrag"
 
@@ -4637,7 +4661,7 @@ 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:285 calendar/gui/e-day-view.c:1374
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1458
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -4649,303 +4673,320 @@ 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:608 calendar/gui/e-week-view.c:344
-#: calendar/gui/print.c:765
+#: calendar/gui/e-day-view.c:608 calendar/gui/e-week-view.c:345
+#: calendar/gui/print.c:769
 msgid "am"
 msgstr " "
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:347
-#: calendar/gui/print.c:767
+#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:348
+#: calendar/gui/print.c:771
 msgid "pm"
 msgstr " "
 
-#: calendar/gui/e-day-view.c:3422 calendar/gui/e-week-view.c:3270
+#: calendar/gui/e-day-view.c:3424 calendar/gui/e-week-view.c:3278
 #, fuzzy
 msgid "New All Day _Event"
 msgstr "Ny aftal_e"
 
-#: calendar/gui/e-day-view.c:3432 calendar/gui/e-week-view.c:3280
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3288
 #: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "G� _til idag"
 
-#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3282
+#: calendar/gui/e-day-view.c:3436 calendar/gui/e-week-view.c:3290
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "G� til dato..."
 
-#: calendar/gui/e-day-view.c:3443 calendar/gui/e-week-view.c:3290
+#: calendar/gui/e-day-view.c:3445 calendar/gui/e-week-view.c:3298
 #, fuzzy
 msgid "_Delete this Appointment"
 msgstr "Fjern denne aftale"
 
-#: calendar/gui/e-day-view.c:3462 calendar/gui/e-week-view.c:3315
+#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3323
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "Gem aktiv fil"
 
-#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3317
+#: calendar/gui/e-day-view.c:3466 calendar/gui/e-week-view.c:3325
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "Slet alle opf�ringer"
 
-#: calendar/gui/e-day-view.c:3466 calendar/gui/e-week-view.c:3319
+#: calendar/gui/e-day-view.c:3468 calendar/gui/e-week-view.c:3327
 #, fuzzy
 msgid "Delete _All Occurrences"
 msgstr "Slet alle opf�ringer"
 
+#: calendar/gui/e-itip-control.c:469
+msgid "Meeting begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:474
+msgid "Task begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:479
+#, fuzzy
+msgid "Free/Busy info begins: <b>"
+msgstr "Ingen information"
+
+#: calendar/gui/e-itip-control.c:483
+msgid "Begins: <b>"
+msgstr ""
+
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:677
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:664
+#: calendar/gui/e-itip-control.c:692
 #, c-format
 msgid "<b>Summary:</b> %s<br><br>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:664
+#: calendar/gui/e-itip-control.c:692
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:674
+#: calendar/gui/e-itip-control.c:702
 #, fuzzy, c-format
 msgid "<b>Description:</b> %s"
 msgstr "Beskrivelse:"
 
-#: calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:737
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:738
 #, fuzzy
 msgid "Meeting Information"
 msgstr "Information"
 
-#: calendar/gui/e-itip-control.c:715
+#: calendar/gui/e-itip-control.c:742
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:716
+#: calendar/gui/e-itip-control.c:743
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "Annull�r m�de"
 
-#: calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-itip-control.c:747
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:721
+#: calendar/gui/e-itip-control.c:748
 #, fuzzy
 msgid "Meeting Update"
 msgstr "S_lut-tid for m�de:"
 
-#: calendar/gui/e-itip-control.c:725
+#: calendar/gui/e-itip-control.c:752
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:726
+#: calendar/gui/e-itip-control.c:753
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:730
+#: calendar/gui/e-itip-control.c:757
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "_Dette er postadressen"
 
-#: calendar/gui/e-itip-control.c:731
+#: calendar/gui/e-itip-control.c:758
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "Annull�r m�de"
 
-#: calendar/gui/e-itip-control.c:735
+#: calendar/gui/e-itip-control.c:762
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:736
+#: calendar/gui/e-itip-control.c:763
 #, fuzzy
 msgid "Meeting Cancellation"
 msgstr "V�lg fil"
 
-#: calendar/gui/e-itip-control.c:740 calendar/gui/e-itip-control.c:788
-#: calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:767 calendar/gui/e-itip-control.c:815
+#: calendar/gui/e-itip-control.c:848
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:741
+#: calendar/gui/e-itip-control.c:768
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "Find i besked"
 
-#: calendar/gui/e-itip-control.c:758
+#: calendar/gui/e-itip-control.c:785
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:759
+#: calendar/gui/e-itip-control.c:786
 #, fuzzy
 msgid "Task Information"
 msgstr "Information"
 
-#: calendar/gui/e-itip-control.c:763
+#: calendar/gui/e-itip-control.c:790
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:791
 #, fuzzy
 msgid "Task Proposal"
 msgstr "Opgaveblok"
 
-#: calendar/gui/e-itip-control.c:768
+#: calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:769
+#: calendar/gui/e-itip-control.c:796
 #, fuzzy
 msgid "Task Update"
 msgstr "var efter"
 
-#: calendar/gui/e-itip-control.c:773
+#: calendar/gui/e-itip-control.c:800
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:774
+#: calendar/gui/e-itip-control.c:801
 #, fuzzy
 msgid "Task Update Request"
 msgstr "_Opgaveforesp�rgsel"
 
-#: calendar/gui/e-itip-control.c:778
+#: calendar/gui/e-itip-control.c:805
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "_Dette er postadressen"
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:806
 #, fuzzy
 msgid "Task Reply"
 msgstr "Svar"
 
-#: calendar/gui/e-itip-control.c:783
+#: calendar/gui/e-itip-control.c:810
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:784
+#: calendar/gui/e-itip-control.c:811
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "Annull�r m�de"
 
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:816
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "Kalenderbesked"
 
-#: calendar/gui/e-itip-control.c:806
+#: calendar/gui/e-itip-control.c:833
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:807
+#: calendar/gui/e-itip-control.c:834
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "Ingen information"
 
-#: calendar/gui/e-itip-control.c:811
+#: calendar/gui/e-itip-control.c:838
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:812
+#: calendar/gui/e-itip-control.c:839
 #, fuzzy
 msgid "Free/Busy Request"
 msgstr "Ledig-optaget URL"
 
-#: calendar/gui/e-itip-control.c:816
+#: calendar/gui/e-itip-control.c:843
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "_Dette er postadressen"
 
-#: calendar/gui/e-itip-control.c:817
+#: calendar/gui/e-itip-control.c:844
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "Ledig-optaget URL"
 
-#: calendar/gui/e-itip-control.c:822
+#: calendar/gui/e-itip-control.c:849
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "Forrige besked"
 
-#: calendar/gui/e-itip-control.c:889
+#: calendar/gui/e-itip-control.c:916
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "Mappen set ud til at v�re uigenkaldeligt �delagt."
 
-#: calendar/gui/e-itip-control.c:908
+#: calendar/gui/e-itip-control.c:935
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:936 calendar/gui/e-itip-control.c:942
+#: calendar/gui/e-itip-control.c:963 calendar/gui/e-itip-control.c:969
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1088
 #, fuzzy
 msgid "Calendar file could not be updated!\n"
 msgstr "Mark�ren kunne ikke indl�ses\n"
 
-#: calendar/gui/e-itip-control.c:1063
+#: calendar/gui/e-itip-control.c:1090
 #, fuzzy
 msgid "Update complete\n"
 msgstr "Fuldf�rt dato:"
 
-#: calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.c:1134
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1142
 msgid "Attendee status ould not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1144
 #, fuzzy
 msgid "Attendee status updated\n"
 msgstr "Deltagers adresse"
 
-#: calendar/gui/e-itip-control.c:1119
+#: calendar/gui/e-itip-control.c:1146
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1174
 #, fuzzy
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "Kunne ikke l�se din kalenderfil!\n"
 
-#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-itip-control.c:1176
 #, fuzzy
 msgid "Removal Complete"
 msgstr "% f�rdi_g:"
 
-#: calendar/gui/e-itip-control.c:1181 calendar/gui/e-itip-control.c:1216
+#: calendar/gui/e-itip-control.c:1208 calendar/gui/e-itip-control.c:1242
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "Dato sendt"
 
-#: calendar/gui/e-itip-control.c:1183 calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1210 calendar/gui/e-itip-control.c:1246
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1380
+#: calendar/gui/e-itip-control.c:1406
 msgid "Unable to find any of your identities in the attendees list!\n"
 msgstr ""
 
@@ -5008,6 +5049,14 @@ msgstr "Kilder"
 msgid "Room"
 msgstr ""
 
+#: calendar/gui/e-meeting-model.c:226 calendar/gui/e-meeting-model.c:261
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:674
+#: calendar/gui/e-meeting-model.c:690
+#: camel/providers/smtp/camel-smtp-transport.c:224
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
+msgid "Unknown"
+msgstr "Ukendt fejl"
+
 #: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
 #: calendar/gui/e-meeting-model.c:686
 msgid "Chair"
@@ -5065,14 +5114,14 @@ msgstr "Under udarbejdelse"
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:472
-#: calendar/gui/e-meeting-time-sel.c:1936
+#: calendar/gui/e-meeting-time-sel.c:1937
 msgid "%A, %B %d, %Y"
 msgstr "%A den %e. %B %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:476
-#: calendar/gui/e-meeting-time-sel.c:1964 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:1965 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:345
 msgid "%a %m/%d/%Y"
 msgstr "%a %Y-%m-%d"
@@ -5080,7 +5129,7 @@ msgstr "%a %Y-%m-%d"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:480 e-util/e-time-utils.c:221
-#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1552
+#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1577
 msgid "%m/%d/%Y"
 msgstr "%Y-%m-%d"
 
@@ -5158,17 +5207,17 @@ msgstr "Kunne ikke indl�se opgaverne i '%s'"
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoden der kr�ves for at indl�se '%s' er ikke underst�ttet"
 
-#: calendar/gui/e-week-view.c:3268 calendar/gui/e-week-view.c:3306
+#: calendar/gui/e-week-view.c:3276 calendar/gui/e-week-view.c:3314
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "Ny aftale..."
 
-#: calendar/gui/gnome-cal.c:1318
+#: calendar/gui/gnome-cal.c:1319
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Kunne ikke �bne mappen i `%s'"
 
-#: calendar/gui/gnome-cal.c:1329
+#: calendar/gui/gnome-cal.c:1330
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoden som er n�dvendig for at �bne `%s' er ikke st�ttet"
@@ -5239,205 +5288,205 @@ msgstr ""
 msgid "Could not create the component editor factory"
 msgstr "Kunne ikke oprette midlertidig katalog: %s"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:432
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "Su"
 msgstr "s�n"
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "Mo"
 msgstr "man"
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "Tu"
 msgstr "tir"
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "We"
 msgstr "ons"
 
-#: calendar/gui/print.c:497
+#: calendar/gui/print.c:500
 msgid "Th"
 msgstr "tor"
 
-#: calendar/gui/print.c:497
+#: calendar/gui/print.c:500
 msgid "Fr"
 msgstr "fre"
 
-#: calendar/gui/print.c:497
+#: calendar/gui/print.c:500
 msgid "Sa"
 msgstr "l�r"
 
 #. Day
-#: calendar/gui/print.c:1827
+#: calendar/gui/print.c:1831
 #, fuzzy
 msgid "Selected day (%a %b %d %Y)"
 msgstr "I dag (%a %d %b %Y)"
 
-#: calendar/gui/print.c:1846 calendar/gui/print.c:1850
+#: calendar/gui/print.c:1850 calendar/gui/print.c:1854
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1847
+#: calendar/gui/print.c:1851
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1858
+#: calendar/gui/print.c:1862
 #, fuzzy, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Denne uge (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1866
+#: calendar/gui/print.c:1870
 #, fuzzy
 msgid "Selected month (%b %Y)"
 msgstr "Denne m�ned (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1873
+#: calendar/gui/print.c:1877
 #, fuzzy
 msgid "Selected year (%Y)"
 msgstr "Dette �r (%Y)"
 
-#: calendar/gui/print.c:2214
+#: calendar/gui/print.c:2221
 msgid "Print Calendar"
 msgstr "Udskriv kalender"
 
-#: calendar/gui/print.c:2302 calendar/gui/print.c:2394
-#: mail/mail-callbacks.c:2071 my-evolution/e-summary.c:551
+#: calendar/gui/print.c:2312 calendar/gui/print.c:2404
+#: mail/mail-callbacks.c:2080 my-evolution/e-summary.c:607
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
 msgstr "Forh�ndsvisning af udskrift"
 
-#: calendar/gui/print.c:2331
+#: calendar/gui/print.c:2341
 #, fuzzy
 msgid "Print Item"
 msgstr "Udskriv denne ting"
 
-#: calendar/gui/print.c:2412
+#: calendar/gui/print.c:2422
 msgid "Print Setup"
 msgstr "Skriverops�tning"
 
@@ -5635,65 +5684,80 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr "Synkroniserer mappe"
 
-#: camel/camel-disco-store.c:305
+#: camel/camel-disco-store.c:336
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
+#: camel/camel-filter-driver.c:549 camel/camel-filter-driver.c:558
 msgid "Syncing folders"
 msgstr ""
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:659
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:668
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:667
+#: camel/camel-filter-driver.c:683
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Henter besked %d (%d%%)"
 
-#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
+#: camel/camel-filter-driver.c:687 camel/camel-filter-driver.c:700
 #, fuzzy, c-format
 msgid "Failed on message %d"
 msgstr "Fejlede ved besked %d af %d"
 
-#: camel/camel-filter-driver.c:672
+#: camel/camel-filter-driver.c:688
 msgid "Cannot open message"
 msgstr "Kan ikke �bne besked"
 
-#: camel/camel-filter-driver.c:698 camel/camel-filter-driver.c:814
+#: camel/camel-filter-driver.c:714 camel/camel-filter-driver.c:829
 msgid "Syncing folder"
 msgstr "Synkroniserer mappe"
 
-#: camel/camel-filter-driver.c:770
+#: camel/camel-filter-driver.c:786
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Henter besked %d af %d"
 
-#: camel/camel-filter-driver.c:775 camel/camel-filter-driver.c:793
+#: camel/camel-filter-driver.c:791 camel/camel-filter-driver.c:809
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Fejlede ved besked %d af %d"
 
-#: camel/camel-filter-driver.c:900
+#: camel/camel-filter-driver.c:918
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:906
+#: camel/camel-filter-driver.c:924
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-search.c:479 camel/camel-filter-search.c:486
+#: camel/camel-filter-search.c:494 camel/camel-filter-search.c:501
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
 
+#: camel/camel-folder.c:472
+#, fuzzy, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Kan ikke tilf�je besked i mh-mappe: %s: %s"
+
+#: camel/camel-folder.c:1039
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1219
+#, fuzzy
+msgid "Moving messages"
+msgstr "Kopierer beskeder"
+
 #: camel/camel-folder-search.c:333
 #, c-format
 msgid ""
@@ -5717,7 +5781,7 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:747 camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:748 camel/camel-folder-search.c:792
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Ugyldig type i krop-beholder, forventer streng"
 
@@ -5816,81 +5880,81 @@ msgstr "Fejl ved skriving af midlertidig fil: %s"
 msgid "Error copying mail temp file: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:193
+#: camel/camel-pgp-context.c:191
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Indtast venligst din %s adgangskode for %s"
 
-#: camel/camel-pgp-context.c:196
+#: camel/camel-pgp-context.c:194
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "Indtast venligst din %s adgangskode"
 
-#: camel/camel-pgp-context.c:518
+#: camel/camel-pgp-context.c:525
 #, fuzzy
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr "Kan ikke sende besked: ingen modtagere defineret."
 
-#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:532 camel/camel-pgp-context.c:706
 #, fuzzy
 msgid "Cannot sign this message: no password provided"
 msgstr "Kan ikke sende besked: afsenderadresse ikke gyldig."
 
-#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:538 camel/camel-pgp-context.c:712
 #, fuzzy, c-format
 msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "Kunne ikke oprette r�r til GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:693
+#: camel/camel-pgp-context.c:699
 #, fuzzy
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr "Kan ikke sende besked: ingen modtagere defineret."
 
-#: camel/camel-pgp-context.c:886
+#: camel/camel-pgp-context.c:891
 #, fuzzy
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr "Kan ikke sende besked: ingen modtagere defineret."
 
-#: camel/camel-pgp-context.c:892
+#: camel/camel-pgp-context.c:897
 #, fuzzy, c-format
 msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "Kunne ikke oprette r�r til GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:903
+#: camel/camel-pgp-context.c:908
 #, fuzzy, c-format
 msgid "Cannot verify this message: couldn't create temp file: %s"
 msgstr "Kunne ikke oprette midlertidig fil: %s"
 
-#: camel/camel-pgp-context.c:1069
+#: camel/camel-pgp-context.c:1076
 #, fuzzy
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr "Kan ikke sende besked: ingen modtagere defineret."
 
-#: camel/camel-pgp-context.c:1079
+#: camel/camel-pgp-context.c:1086
 #, fuzzy
 msgid "Cannot encrypt this message: no password provided"
 msgstr "Kan ikke sende besked: afsenderadresse ikke gyldig."
 
-#: camel/camel-pgp-context.c:1086
+#: camel/camel-pgp-context.c:1093
 #, fuzzy, c-format
 msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "Kunne ikke oprette r�r til GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:1095
+#: camel/camel-pgp-context.c:1102
 #, fuzzy
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr "Kan ikke sende besked: ingen modtagere defineret."
 
-#: camel/camel-pgp-context.c:1258
+#: camel/camel-pgp-context.c:1264
 #, fuzzy
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr "Kan ikke sende besked: ingen modtagere defineret."
 
-#: camel/camel-pgp-context.c:1266
+#: camel/camel-pgp-context.c:1272
 msgid "Cannot decrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1273
+#: camel/camel-pgp-context.c:1279
 #, fuzzy, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "Kunne ikke oprette r�r til GPG/PGP: %s"
@@ -5934,13 +5998,13 @@ msgstr "Kunne ikke koble til %s (port %d): %s"
 msgid "(unknown host)"
 msgstr "(ukendt v�rt)"
 
-#: camel/camel-remote-store.c:361 camel/camel-remote-store.c:423
-#: camel/camel-remote-store.c:486
+#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
+#: camel/camel-remote-store.c:483
 #: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "Handling annulleret"
 
-#: camel/camel-remote-store.c:489
+#: camel/camel-remote-store.c:486
 #, fuzzy, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server frakoblet uventet"
@@ -6040,7 +6104,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:492
+#: camel/providers/imap/camel-imap-store.c:494
 msgid "Bad authentication response from server."
 msgstr "Forkert autoriseringsbesked fra server."
 
@@ -6059,7 +6123,7 @@ msgstr "Autenticering kr�ves"
 
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:302
-#: camel/providers/pop3/camel-pop3-provider.c:68 mail/mail-config.glade.h:54
+#: camel/providers/pop3/camel-pop3-provider.c:68 mail/mail-config.glade.h:55
 msgid "Password"
 msgstr "Adgangskode"
 
@@ -6090,37 +6154,37 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:154
+#: camel/camel-service.c:157
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' skal indeholde et brugernavn"
 
-#: camel/camel-service.c:162
+#: camel/camel-service.c:165
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' skal indeholde et vertsnavn"
 
-#: camel/camel-service.c:170
+#: camel/camel-service.c:173
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' skal indeholde en sti"
 
-#: camel/camel-service.c:548
+#: camel/camel-service.c:602
 #, c-format
 msgid "Resolving: %s"
 msgstr "L�ser: '%s'"
 
-#: camel/camel-service.c:575
+#: camel/camel-service.c:629
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:600
+#: camel/camel-service.c:654
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:602
+#: camel/camel-service.c:656
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
@@ -6133,12 +6197,12 @@ msgstr "E-post-udbyder for virtuelle mapper"
 msgid "For reading mail as a query of another set of folders"
 msgstr "For l�sning af e-post som en anmodning p� et andet s�t af mapper"
 
-#: camel/camel-session.c:322 camel/camel-session.c:391
+#: camel/camel-session.c:324 camel/camel-session.c:393
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Ingen udbyder tilg�ngelig for protokol `%s'"
 
-#: camel/camel-session.c:508
+#: camel/camel-session.c:510
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -6190,7 +6254,7 @@ msgstr ""
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Kan ikke f� fat p� mappe: %s: %s"
 
-#: camel/camel-tcp-stream-openssl.c:463
+#: camel/camel-tcp-stream-openssl.c:491
 #, fuzzy, c-format
 msgid ""
 "Issuer: %s\n"
@@ -6198,7 +6262,7 @@ msgid ""
 msgstr "Emne er %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:369
+#: camel/camel-tcp-stream-openssl.c:496 camel/camel-tcp-stream-ssl.c:369
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -6225,17 +6289,37 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr ""
 
-#: camel/camel-vee-folder.c:546
+#: camel/camel-vee-folder.c:554
 #, fuzzy, c-format
 msgid "No such message %s in %s"
 msgstr "Ingen s�dan besked: %s"
 
-#: camel/camel-vee-folder.c:641
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message: %s"
 msgstr "Ingen s�dan besked: %s"
 
-#: camel/camel-vtrash-folder.c:106
+#: camel/camel-vee-store.c:250
+#, fuzzy, c-format
+msgid "Cannot delete folder: %s: Invalid operation"
+msgstr "Kan ikke f� fat p� mappe: %s: %s"
+
+#: camel/camel-vee-store.c:286
+#, fuzzy, c-format
+msgid "Cannot delete folder: %s: No such folder"
+msgstr "Kan ikke f� fat p� mappe: %s: %s"
+
+#: camel/camel-vee-store.c:298
+#, fuzzy, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "Kan ikke f� fat p� mappe: %s: %s"
+
+#: camel/camel-vee-store.c:326
+#, fuzzy, c-format
+msgid "Cannot rename folder: %s: No such folder"
+msgstr "Kan ikke f� fat p� mappe: %s: %s"
+
+#: camel/camel-vtrash-folder.c:109
 #, fuzzy
 msgid "You cannot copy messages from this trash folder."
 msgstr ""
@@ -6287,7 +6371,7 @@ msgid "Scanning for changed messages"
 msgstr "Gemmer beskeder"
 
 #: camel/providers/imap/camel-imap-folder.c:1491
-#: camel/providers/imap/camel-imap-folder.c:1890
+#: camel/providers/imap/camel-imap-folder.c:1899
 msgid "This message is not currently available"
 msgstr ""
 
@@ -6301,7 +6385,7 @@ msgstr ""
 msgid "Scanning for new messages"
 msgstr "Gemmer beskeder"
 
-#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/imap/camel-imap-folder.c:1936
 msgid "Could not find message body in FETCH response."
 msgstr "Kunne ikke finde beskedskrop i FETCH-svar."
 
@@ -6318,7 +6402,7 @@ msgstr "Kan ikke oprette katalog %s: %s"
 msgid "Failed to cache message %s: %s"
 msgstr "Vedh�ft bilag til meddelelsen"
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:14
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:15
 msgid "Checking for new mail"
 msgstr "Tjekker for nyt post"
 
@@ -6326,7 +6410,7 @@ msgstr "Tjekker for nyt post"
 msgid "Check for new messages in all folders"
 msgstr "Tjek for nye beskeder i alle mapper"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:733
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:767
 msgid "Folders"
 msgstr "Mapper"
 
@@ -6361,28 +6445,28 @@ msgstr ""
 "Dette valg vil lade dig koble til en IMAP-tjener ved at bruge en klartekst-"
 "adgangskode."
 
-#: camel/providers/imap/camel-imap-store.c:515
+#: camel/providers/imap/camel-imap-store.c:517
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:525
+#: camel/providers/imap/camel-imap-store.c:527
 #: camel/providers/smtp/camel-smtp-transport.c:388
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Ingen st�tte for autenticeringstype %s"
 
-#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap/camel-imap-store.c:551
 #, 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:564
+#: camel/providers/imap/camel-imap-store.c:566
 #: camel/providers/smtp/camel-smtp-transport.c:432
 msgid "You didn't enter a password."
 msgstr "Du indtastede ikke en adgangskode."
 
-#: camel/providers/imap/camel-imap-store.c:590
+#: camel/providers/imap/camel-imap-store.c:592
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6393,12 +6477,12 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:889
+#: camel/providers/imap/camel-imap-store.c:891
 #, c-format
 msgid "No such folder %s"
 msgstr "Mappen %s eksisterer ikke"
 
-#: camel/providers/imap/camel-imap-store.c:1090
+#: camel/providers/imap/camel-imap-store.c:1131
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -6435,53 +6519,53 @@ msgstr "Qmail maildir-formaterede postfiler"
 msgid "For storing local mail in qmail maildir directories."
 msgstr "For gemning af lokal e-post i qmail beskedskataloger"
 
-#: camel/providers/local/camel-local-provider.c:77
+#: camel/providers/local/camel-local-provider.c:78
 #, fuzzy
 msgid "Standard Unix mbox spools"
 msgstr "Standard-Unix mbox"
 
-#: camel/providers/local/camel-local-provider.c:78
+#: camel/providers/local/camel-local-provider.c:79
 #, fuzzy
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr "For gemning af lokal e-post i qmail beskedskataloger"
 
-#: camel/providers/local/camel-local-store.c:127
-#: camel/providers/local/camel-spool-store.c:112
+#: camel/providers/local/camel-local-store.c:132
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Gemme-rod %s er ikke en absolut sti"
 
-#: camel/providers/local/camel-local-store.c:134
+#: camel/providers/local/camel-local-store.c:139
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Gemme-rod %s er ikke et almindeligt katalog"
 
-#: camel/providers/local/camel-local-store.c:142
-#: camel/providers/local/camel-local-store.c:158
+#: camel/providers/local/camel-local-store.c:147
+#: camel/providers/local/camel-local-store.c:163
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Kan ikke f� fat p� mappe: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:173
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "Lokale gemmesteder har ikke en indbakke"
 
-#: camel/providers/local/camel-local-store.c:183
+#: camel/providers/local/camel-local-store.c:190
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokal e-post-fil %s"
 
-#: camel/providers/local/camel-local-store.c:240
+#: camel/providers/local/camel-local-store.c:247
 #, 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:282
+#: camel/providers/local/camel-local-store.c:289
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Kunne ikke slette oversigtsfil `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:292
+#: camel/providers/local/camel-local-store.c:299
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Kunne ikke slette indeksfil `%s': %s"
@@ -6771,27 +6855,27 @@ msgstr "Kan ikke �bne postboks: %s: %s\n"
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "Kan ikke tilf�je besked i mbox-filen: %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:133
+#: camel/providers/local/camel-spool-store.c:116
 #, fuzzy, c-format
 msgid "Spool `%s' does not exist or is not a regular file"
 msgstr "`%s' er ikke en almindelig fil."
 
-#: camel/providers/local/camel-spool-store.c:159
+#: camel/providers/local/camel-spool-store.c:142
 #, fuzzy, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Mappen `%s' eksisterer ikke."
 
-#: camel/providers/local/camel-spool-store.c:181
+#: camel/providers/local/camel-spool-store.c:164
 #, fuzzy, c-format
 msgid "Spool mail file %s"
 msgstr "Lokal e-post-fil %s"
 
-#: camel/providers/local/camel-spool-store.c:227
+#: camel/providers/local/camel-spool-store.c:210
 #, fuzzy
 msgid "Spool folders cannot be renamed"
 msgstr "Lokale mapper kan ikke v�re rekursive."
 
-#: camel/providers/local/camel-spool-store.c:235
+#: camel/providers/local/camel-spool-store.c:218
 #, fuzzy
 msgid "Spool folders cannot be deleted"
 msgstr "Lokale mapper kan ikke v�re rekursive."
@@ -6919,31 +7003,31 @@ msgstr "Modtager POP-oversigt"
 msgid "Could not check POP server for new messages: %s"
 msgstr "Kunne ikke koble til POP-tjener p� %s."
 
-#: camel/providers/pop3/camel-pop3-folder.c:235
+#: camel/providers/pop3/camel-pop3-folder.c:242
 msgid "Could not open folder: message listing was incomplete."
 msgstr "Kunne ikke �bne mappe: beskedslisten var ikke komplet."
 
-#: camel/providers/pop3/camel-pop3-folder.c:259
+#: camel/providers/pop3/camel-pop3-folder.c:266
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "Udskriv den valgte meddelelse"
 
-#: camel/providers/pop3/camel-pop3-folder.c:335
+#: camel/providers/pop3/camel-pop3-folder.c:342
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "Kunne ikke hente beskeden: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:351
+#: camel/providers/pop3/camel-pop3-folder.c:358
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Kunne ikke hente besked fra POP-tjener %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:374
+#: camel/providers/pop3/camel-pop3-folder.c:381
 #, c-format
 msgid "No message with uid %s"
 msgstr "Ingen besked med uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:378
+#: camel/providers/pop3/camel-pop3-folder.c:385
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Modtager POP-meddelelse %d"
@@ -6961,7 +7045,7 @@ msgstr "Efterlad beskeder p� tjeneren"
 msgid "Delete after %s day(s)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:53
+#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:54
 msgid "POP"
 msgstr "POP"
 
@@ -7058,7 +7142,7 @@ msgid "Unexpected response from POP server: %s"
 msgstr "Uventet svar fra IMAP-tjener: %s"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:73
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -7112,7 +7196,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Levering af e-post via sendmail programmet"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:66
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -7745,13 +7829,13 @@ msgstr ""
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:309 e-util/e-time-utils.c:396
-#: widgets/misc/e-dateedit.c:1360 widgets/misc/e-dateedit.c:1587
+#: widgets/misc/e-dateedit.c:1385 widgets/misc/e-dateedit.c:1612
 msgid "%I:%M %p"
 msgstr " "
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:313 e-util/e-time-utils.c:388
-#: widgets/misc/e-dateedit.c:1357 widgets/misc/e-dateedit.c:1584
+#: widgets/misc/e-dateedit.c:1382 widgets/misc/e-dateedit.c:1609
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -7903,8 +7987,8 @@ msgstr ""
 "Du glemte at v�lge en mappe.\n"
 "Venligst g� tilbage og specific�r en gyldig mappe for levering af e-post."
 
-#: filter/filter-folder.c:232 filter/vfolder-rule.c:351
-#: mail/mail-account-gui.c:820
+#: filter/filter-folder.c:232 filter/vfolder-rule.c:356
+#: mail/mail-account-gui.c:822
 msgid "Select Folder"
 msgstr "V�lg mappe"
 
@@ -8155,7 +8239,7 @@ msgstr "Svaret til"
 msgid "Score"
 msgstr "Point"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1242
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1251
 msgid "Sender"
 msgstr "Afsender"
 
@@ -8188,7 +8272,7 @@ msgstr "starter med"
 msgid "Stop Processing"
 msgstr "Stop behandling"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:893
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:917
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Emne"
@@ -8217,7 +8301,7 @@ msgstr "�ndr regel"
 msgid "Score Rules"
 msgstr ""
 
-#: filter/vfolder-rule.c:203
+#: filter/vfolder-rule.c:206
 msgid "Oops.  You need to to specify at least one folder as a source."
 msgstr ""
 
@@ -8238,7 +8322,7 @@ msgstr "Importerer"
 msgid "Please wait"
 msgstr "slutter med"
 
-#: importers/elm-importer.c:171 importers/netscape-importer.c:701
+#: importers/elm-importer.c:171 importers/netscape-importer.c:708
 #: importers/pine-importer.c:369
 #, fuzzy, c-format
 msgid "Importing %s as %s"
@@ -8246,13 +8330,13 @@ msgstr ""
 "Importerer %s.\n"
 "Starter %s"
 
-#: importers/elm-importer.c:377 importers/netscape-importer.c:794
+#: importers/elm-importer.c:377 importers/netscape-importer.c:801
 #: importers/pine-importer.c:506
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "Unders�ker %s"
 
-#: importers/elm-importer.c:528 importers/netscape-importer.c:967
+#: importers/elm-importer.c:528 importers/netscape-importer.c:974
 #: importers/pine-importer.c:669 mail/component-factory.c:96
 msgid "Mail"
 msgstr "Epost"
@@ -8286,21 +8370,21 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: importers/netscape-importer.c:897 importers/pine-importer.c:602
+#: importers/netscape-importer.c:904 importers/pine-importer.c:602
 #, fuzzy
 msgid "Scanning directory"
 msgstr "Lokal e-post-fil %s"
 
-#: importers/netscape-importer.c:906
+#: importers/netscape-importer.c:913
 #, fuzzy
 msgid "Starting import"
 msgstr "_Start dato:"
 
-#: importers/netscape-importer.c:972
+#: importers/netscape-importer.c:979
 msgid "Settings"
 msgstr "Indstillinger"
 
-#: importers/netscape-importer.c:993
+#: importers/netscape-importer.c:1000
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8387,21 +8471,27 @@ msgstr "Egenska_ber..."
 msgid "Change this folder's properties"
 msgstr "�ndr filens egenskaber"
 
-#: mail/component-factory.c:790
+#: mail/component-factory.c:698
+msgid ""
+"Some of your mail settings seem corrupt, please check that everything is in "
+"order."
+msgstr ""
+
+#: mail/component-factory.c:812
 #, fuzzy
 msgid "New Mail Message"
 msgstr "_Postmeddelelse"
 
-#: mail/component-factory.c:790
+#: mail/component-factory.c:812
 #, fuzzy
 msgid "New _Mail Message"
 msgstr "_Postmeddelelse"
 
-#: mail/component-factory.c:821
+#: mail/component-factory.c:843
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan ikke initialisere Evolutions e-postkomponent."
 
-#: mail/component-factory.c:1007
+#: mail/component-factory.c:1032
 msgid "Cannot register storage with shell"
 msgstr "Kan ikke registrere gemning i skallen"
 
@@ -8414,165 +8504,165 @@ msgstr "Egenskaber for \"%s\""
 msgid "Properties"
 msgstr "Egenskaber"
 
-#: mail/folder-browser.c:239 mail/mail-display.c:275
+#: mail/folder-browser.c:262 mail/mail-display.c:275
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Kunne ikke oprette midlertidig katalog: %s"
 
-#: mail/folder-browser.c:708
+#: mail/folder-browser.c:734
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/folder-browser.c:711 mail/folder-browser.c:716
-#: mail/folder-browser.c:720
+#: mail/folder-browser.c:737 mail/folder-browser.c:742
+#: mail/folder-browser.c:746
 msgid ", "
 msgstr ""
 
-#: mail/folder-browser.c:712
+#: mail/folder-browser.c:738
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/folder-browser.c:717
+#: mail/folder-browser.c:743
 #, fuzzy, c-format
 msgid "%d selected"
 msgstr "Skjul valgte beskeder"
 
-#: mail/folder-browser.c:722
+#: mail/folder-browser.c:748
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr " %d sekunder"
 
-#: mail/folder-browser.c:724
+#: mail/folder-browser.c:750
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/folder-browser.c:958
+#: mail/folder-browser.c:993
 #, fuzzy
 msgid "Create vFolder from Search"
 msgstr "_Opret filter fra besked"
 
-#: mail/folder-browser.c:1303
+#: mail/folder-browser.c:1338
 msgid "VFolder on _Subject"
 msgstr "VFolder p� e_mne"
 
-#: mail/folder-browser.c:1306
+#: mail/folder-browser.c:1341
 msgid "VFolder on Se_nder"
 msgstr "vMappe for _afsender"
 
-#: mail/folder-browser.c:1309
+#: mail/folder-browser.c:1344
 msgid "VFolder on _Recipients"
 msgstr "vMappe for _modtagere"
 
-#: mail/folder-browser.c:1312
+#: mail/folder-browser.c:1347
 msgid "VFolder on Mailing _List"
 msgstr "Vfolder efter diskussions_liste"
 
-#: mail/folder-browser.c:1318
+#: mail/folder-browser.c:1353
 msgid "Filter on Sub_ject"
 msgstr "Filtr�r efter emne"
 
-#: mail/folder-browser.c:1321
+#: mail/folder-browser.c:1356
 msgid "Filter on Sen_der"
 msgstr "Filtr�r efter afsender"
 
-#: mail/folder-browser.c:1324
+#: mail/folder-browser.c:1359
 msgid "Filter on Re_cipients"
 msgstr "Filtr�r efter modtager"
 
-#: mail/folder-browser.c:1327
+#: mail/folder-browser.c:1362
 msgid "Filter on _Mailing List"
 msgstr "Filtr�r efter diskussionsliste"
 
-#: mail/folder-browser.c:1338 ui/evolution-mail-message.xml.h:89
+#: mail/folder-browser.c:1373 ui/evolution-mail-message.xml.h:89
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "_Gem besked som..."
 
-#: mail/folder-browser.c:1340 ui/evolution-mail-message.xml.h:97
+#: mail/folder-browser.c:1375 ui/evolution-mail-message.xml.h:97
 msgid "_Save As..."
 msgstr "_Gem som..."
 
-#: mail/folder-browser.c:1342
+#: mail/folder-browser.c:1377
 msgid "_Print"
 msgstr "_Udskriv"
 
-#: mail/folder-browser.c:1347 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1382 ui/evolution-mail-message.xml.h:96
 msgid "_Reply to Sender"
 msgstr "Svar til afsende_r"
 
-#: mail/folder-browser.c:1349 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1384 ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Reply to _List"
 msgstr "Svar til _alle"
 
-#: mail/folder-browser.c:1351 ui/evolution-mail-message.xml.h:68
+#: mail/folder-browser.c:1386 ui/evolution-mail-message.xml.h:68
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: mail/folder-browser.c:1353
+#: mail/folder-browser.c:1388
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: mail/folder-browser.c:1356 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1391 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "M�r_k som l�st"
 
-#: mail/folder-browser.c:1358 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1393 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "M�rk som u_l�st"
 
-#: mail/folder-browser.c:1360
+#: mail/folder-browser.c:1395
 #, fuzzy
 msgid "Mark as _Important"
 msgstr "Vigtig"
 
-#: mail/folder-browser.c:1362
+#: mail/folder-browser.c:1397
 #, fuzzy
 msgid "Mark as Unim_portant"
 msgstr "Mark�r som ul�st"
 
-#: mail/folder-browser.c:1367
+#: mail/folder-browser.c:1402
 msgid "_Move to Folder..."
 msgstr "_Flyt til mappe..."
 
-#: mail/folder-browser.c:1369
+#: mail/folder-browser.c:1404
 msgid "_Copy to Folder..."
 msgstr "_Kopi�r til mappe..."
 
-#: mail/folder-browser.c:1373 ui/evolution-mail-message.xml.h:99
+#: mail/folder-browser.c:1408 ui/evolution-mail-message.xml.h:99
 msgid "_Undelete"
 msgstr "_Fortryd sletning"
 
-#: mail/folder-browser.c:1378
+#: mail/folder-browser.c:1413
 #, fuzzy
 msgid "Add Sender to Address Book"
 msgstr "Tilf�j adressebog"
 
-#: mail/folder-browser.c:1383
+#: mail/folder-browser.c:1418
 msgid "Apply Filters"
 msgstr "Anvend filtre"
 
-#: mail/folder-browser.c:1387
+#: mail/folder-browser.c:1422
 msgid "Create Ru_le From Message"
 msgstr "Skab rege_l fra besked"
 
-#: mail/folder-browser.c:1538
+#: mail/folder-browser.c:1573
 msgid "Filter on Mailing List"
 msgstr "Filtr�r efter epostliste"
 
-#: mail/folder-browser.c:1539
+#: mail/folder-browser.c:1574
 msgid "VFolder on Mailing List"
 msgstr "vMappe efter diskussionsliste"
 
-#: mail/folder-browser.c:1541
+#: mail/folder-browser.c:1576
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtr�r efter diskussionsliste (%s)"
 
-#: mail/folder-browser.c:1542
+#: mail/folder-browser.c:1577
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "vMappe efter diskussionsliste (%s)"
@@ -8647,19 +8737,19 @@ msgstr "Evolution kontoredigering"
 msgid "Evolution Account Editor"
 msgstr "Evolution kontoredigering"
 
-#: mail/mail-account-gui.c:945
+#: mail/mail-account-gui.c:947
 #, fuzzy
 msgid "Could not save signature file."
 msgstr ""
 "Kunne ikke �bne signaturfilen %s:\n"
 "%s"
 
-#: mail/mail-account-gui.c:1022
+#: mail/mail-account-gui.c:1024
 #, fuzzy
 msgid "Save signature"
 msgstr "Signaturfil:"
 
-#: mail/mail-account-gui.c:1028
+#: mail/mail-account-gui.c:1030
 #, fuzzy
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
@@ -8670,7 +8760,7 @@ msgstr ""
 "\n"
 "Vil du gemme �ndringene?"
 
-#: mail/mail-account-gui.c:1611
+#: mail/mail-account-gui.c:1615
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -8705,7 +8795,7 @@ msgid "Are you sure you want to delete this news account?"
 msgstr "Er du sikker p� at du vil slette denne nyhedskonto?"
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:757 mail/mail-config.glade.h:42
+#: mail/mail-accounts.c:760 mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Mail Settings"
 msgstr "Indstillinger for _post..."
@@ -8808,37 +8898,37 @@ msgstr ""
 msgid "This message contains invalid recipients:"
 msgstr ""
 
-#: mail/mail-callbacks.c:453
+#: mail/mail-callbacks.c:454
 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:549
+#: mail/mail-callbacks.c:550
 msgid "You must configure an account before you can send this email."
 msgstr "Du skal konfigurere en konto f�r du kan sende dette brev."
 
-#: mail/mail-callbacks.c:779
+#: mail/mail-callbacks.c:783
 #, fuzzy
 msgid "an unknown sender"
 msgstr "Ukendt fejl"
 
-#: mail/mail-callbacks.c:784
+#: mail/mail-callbacks.c:788
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1162
+#: mail/mail-callbacks.c:1171
 msgid "Move message(s) to"
 msgstr "Flyt meddelelse(r) til"
 
-#: mail/mail-callbacks.c:1164
+#: mail/mail-callbacks.c:1173
 msgid "Copy message(s) to"
 msgstr "Kopi�r meddelelse(r) til"
 
-#: mail/mail-callbacks.c:1538
+#: mail/mail-callbacks.c:1547
 #, fuzzy, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Er du sikker p� at du vil slette opgaven '%s'?"
 
-#: mail/mail-callbacks.c:1560
+#: mail/mail-callbacks.c:1569
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -8846,7 +8936,7 @@ msgstr ""
 "Du kan kun redigere beskeder lagret\n"
 "i Skitse-kataloget."
 
-#: mail/mail-callbacks.c:1594
+#: mail/mail-callbacks.c:1603
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -8854,29 +8944,29 @@ msgstr ""
 "Du kan kun sende beskeder igen\n"
 "som er gemt i sendt-kataloget."
 
-#: mail/mail-callbacks.c:1606
+#: mail/mail-callbacks.c:1615
 #, fuzzy, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Er du sikker p� at du vil slette opgaven '%s'?"
 
-#: mail/mail-callbacks.c:1627
+#: mail/mail-callbacks.c:1636
 #, fuzzy
 msgid "No Message Selected"
 msgstr "Beskeden blev modtaget"
 
-#: mail/mail-callbacks.c:1712
+#: mail/mail-callbacks.c:1721
 msgid "Save Message As..."
 msgstr "Gem besked som..."
 
-#: mail/mail-callbacks.c:1714
+#: mail/mail-callbacks.c:1723
 msgid "Save Messages As..."
 msgstr "Gem beskeder som..."
 
-#: mail/mail-callbacks.c:1859 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:1868 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Advarsel"
 
-#: mail/mail-callbacks.c:1864
+#: mail/mail-callbacks.c:1873
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8884,11 +8974,11 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1871
+#: mail/mail-callbacks.c:1880
 msgid "Do not ask me again."
 msgstr ""
 
-#: mail/mail-callbacks.c:1976
+#: mail/mail-callbacks.c:1985
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -8897,19 +8987,19 @@ msgstr ""
 "Fejl ved indl�sning af filter information:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1986
+#: mail/mail-callbacks.c:1995
 msgid "Filters"
 msgstr "Filtre"
 
-#: mail/mail-callbacks.c:2032
+#: mail/mail-callbacks.c:2041
 msgid "Print Message"
 msgstr "Udskriv besked"
 
-#: mail/mail-callbacks.c:2078
+#: mail/mail-callbacks.c:2087
 msgid "Printing of message failed"
 msgstr "Udskrivning af besked mislykkedes"
 
-#: mail/mail-callbacks.c:2162
+#: mail/mail-callbacks.c:2171
 #, 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 slette denne nyhedskonto?"
@@ -8968,87 +9058,108 @@ msgstr ""
 msgid "Evolution Account Assistant"
 msgstr "Evolution konto-guide"
 
-#: mail/mail-config.c:1486
-#, fuzzy
-msgid "Evolution Shortcuts"
-msgstr "Evolution fremgang"
+#: mail/mail-config.c:315
+#, fuzzy, c-format
+msgid "Account %d"
+msgstr "Konto"
 
-#. right now, the URL always works basically as a matter of luck...
-#. * both IMAP and mbox spool stores have INBOX as their inbox folder
-#. * name. I don't think this will work with maildir. How can we figure out
-#. * what shortcut to insert?
-#.
 #: mail/mail-config.c:1618
+#, c-format
+msgid ""
+"Could not get inbox for new mail store:\n"
+"%s\n"
+"No shortcut will be created."
+msgstr ""
+
+#. Create the shortcut. FIXME: This only works if the
+#. * full name matches the path.
+#.
+#: mail/mail-config.c:1629
 #, fuzzy, c-format
 msgid "%s: Inbox"
 msgstr "mbox"
 
-#: mail/mail-config.c:1851
+#: mail/mail-config.c:1873
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:1922 mail/mail-config.c:1925
+#: mail/mail-config.c:1944 mail/mail-config.c:1947
 msgid "Connecting to server..."
 msgstr "Opkobler til server..."
 
 #: mail/mail-config.glade.h:1
+#, fuzzy
+msgid " _Check for supported types "
+msgstr " Tjek for st�ttede typer"
+
+#: mail/mail-config.glade.h:2
 msgid " color"
 msgstr " farve"
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:3
 #, fuzzy
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "Den angivne type er ikke underst�ttet i denne gemning"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr "Konto"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr "kontoinformation"
 
-#: mail/mail-config.glade.h:5 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:6 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Kontoadministration"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "Accounts"
 msgstr "Konti"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:10
 msgid "Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:10 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Bilag"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:12
 msgid "Authentication"
 msgstr "Godkendelse"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:13
 msgid "Authentication Type: "
 msgstr "Godkendelsestype: "
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:14
 msgid "Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:16
 msgid "Composer"
 msgstr "Beskedskriver"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:17
+#, fuzzy
+msgid "Configuration"
+msgstr "Konfiguration af epost"
+
+#: mail/mail-config.glade.h:18
+#, fuzzy
+msgid "Confirm when Expunging a folder"
+msgstr "T�mmer mappe for slettede beskeder"
+
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -9060,345 +9171,328 @@ msgstr ""
 "Din epost-konfiguration er nu komplet.\n"
 "Klik \"Fuldf�r\" for at gemme dine nye indstillinger"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr "Standard"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:26
 msgid "Default Forward style is: "
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:27
 msgid "Default character encoding: "
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:29
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:30
 msgid "Display"
 msgstr "Vis"
 
-#: mail/mail-config.glade.h:27 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:31 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "F�rdig"
 
-#: mail/mail-config.glade.h:28 shell/e-local-storage.c:174
+#: mail/mail-config.glade.h:32 shell/e-local-storage.c:174
 msgid "Drafts"
 msgstr "Kladder"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:33
 msgid "Drafts folder:"
 msgstr "Kladdemappe:"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:34
 #, fuzzy
 msgid "E_nable"
 msgstr "Aktiv�r"
 
-#: mail/mail-config.glade.h:31
-#, fuzzy
-msgid "Each account must have a different name."
-msgstr "Gem aktiv fil med et andet navn"
-
-#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:96
 #: widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr "Redig�r..."
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:36
 #, fuzzy
 msgid "Enabled"
 msgstr "Aktiv�r"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:37
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:38
 #, fuzzy
 msgid "HTML signature file:"
 msgstr "Signaturfil:"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:39
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:40 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Identitet"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:41
 msgid "In HTML mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:42
 msgid "Inline"
 msgstr "Vis i brev"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:43
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:44
 msgid "Mail Configuration"
 msgstr "Konfiguration af epost"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Mailbox location"
 msgstr "Postkasseformat"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Make this my _default account"
 msgstr "G�r dette til min standardkonto"
 
-#: mail/mail-config.glade.h:45
-msgid "Message _preview should be displayed by default"
-msgstr ""
-
-#: mail/mail-config.glade.h:46
-msgid "Message list should display in a _threaded fashion by default"
-msgstr ""
-
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "NNTP Server:"
 msgstr "Tjenertype:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:49
 msgid "News"
 msgstr "Nyheder"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:51
 msgid "Optional Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:53
 msgid "PGP Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 msgid "Pick a color"
 msgstr "V�lg en farve"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 #, fuzzy
 msgid "Prompt when sending messages with an _empty subject"
 msgstr "Legger til en melding uten emne"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr "Kan ikke sende besked: ingen modtagere defineret."
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:60
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid "Quoted"
 msgstr "Bem�rkning"
 
-#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Modtager post"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:63
 msgid "Receiving Mail"
 msgstr "Modtager post"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:64
 msgid "Receiving Options"
 msgstr ""
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:65
 msgid "Required Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Secure MIME"
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:68
 #, fuzzy
 msgid "Security"
 msgstr "_Sikkerhed"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Select Filter Log file..."
 msgstr "V�lg fil"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:70
 msgid "Select PGP binary"
 msgstr "V�lg PGP bin�r"
 
-#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:71 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Sender post"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:72
 msgid "Sending Mail"
 msgstr "Sender post"
 
-#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:74 mail/message-list.etspec.h:6
 #: shell/e-local-storage.c:177
 msgid "Sent"
 msgstr "Sendt"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:75
 msgid "Sent and Draft Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:76
 msgid "Sent messages folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:77
 msgid "Server Configuration"
 msgstr "Konfiguration af tjener"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 msgid "Server Type: "
 msgstr "Tjenertype:"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "Server requires _authentication"
 msgstr "Server kr�ver autentificering"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:80
 msgid "Signature file:"
 msgstr "Signaturfil:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Source"
 msgstr "Kilder"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "Source Information"
 msgstr "Ingen information"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:83
 msgid "Sources"
 msgstr "Kilder"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
 msgid "Special Folders"
 msgstr "Specielle mapper"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:85
 msgid "Standard Unix mbox"
 msgstr "Standard-Unix mbox"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "Use secure connection (_SSL)"
 msgstr "Brug sikker forbindelse (SSL)"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:88
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "_Always load images off the net"
 msgstr "Indl�s aftid billeder fra nettet"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:93
 #, fuzzy
 msgid "_Automatically check for new mail every"
 msgstr "Tjek automatisk for nye beskeder hvert"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "_Check for supported types"
 msgstr " Tjek for st�ttede typer"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "_Email Address:"
 msgstr "Epostadresse:"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:98
 msgid "_Empty trash folders on exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 #, fuzzy
 msgid "_Full Name:"
 msgstr "Fulde navn:"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "_HTML Signature:"
 msgstr "Signaturfil:"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 msgid "_Highlight citations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "_Host:"
 msgstr "V�rt:"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 msgid "_Log filter actions to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 #, fuzzy
 msgid "_Mark messages as Read after"
 msgstr "Udskriv den valgte meddelelse"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 #, fuzzy
 msgid "_Name:"
 msgstr "Navn:"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 #, fuzzy
 msgid "_Never load images off the net"
 msgstr "Indl�s aftid billeder fra nettet"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 #, fuzzy
 msgid "_Organization:"
 msgstr "Organisation:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:109
 #, fuzzy
 msgid "_PGP binary path:"
 msgstr "PGP bin�rsti:"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "_Path:"
 msgstr "Sti:"
 
-#: mail/mail-config.glade.h:110
-msgid "_Remember PGP Passphrase until exit"
-msgstr ""
-
 #: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "_Remember this password"
@@ -9437,54 +9531,54 @@ msgstr ""
 msgid "seconds."
 msgstr "sekunder."
 
-#: mail/mail-crypto.c:60
+#: mail/mail-crypto.c:59
 #, fuzzy
 msgid "Could not create a PGP signature context."
 msgstr "Kunne ikke indl�se sammendrag for %s"
 
-#: mail/mail-crypto.c:86
+#: mail/mail-crypto.c:84
 #, fuzzy
 msgid "Could not create a PGP verification context."
 msgstr ""
 "Kunne ikke oprette mappe `%s':\n"
 "%s"
 
-#: mail/mail-crypto.c:116
+#: mail/mail-crypto.c:113
 #, fuzzy
 msgid "Could not create a PGP encryption context."
 msgstr ""
 "Kunne ikke oprette mappe `%s':\n"
 "%s"
 
-#: mail/mail-crypto.c:142
+#: mail/mail-crypto.c:138
 #, fuzzy
 msgid "Could not create a PGP decryption context."
 msgstr ""
 "Kunne ikke oprette mappe `%s':\n"
 "%s"
 
-#: mail/mail-crypto.c:177
+#: mail/mail-crypto.c:173
 #, fuzzy
 msgid "Could not create a S/MIME signature context."
 msgstr "Kunne ikke indl�se sammendrag for %s"
 
-#: mail/mail-crypto.c:209
+#: mail/mail-crypto.c:205
 msgid "Could not create a S/MIME certsonly context."
 msgstr ""
 
-#: mail/mail-crypto.c:240
+#: mail/mail-crypto.c:236
 #, fuzzy
 msgid "Could not create a S/MIME encryption context."
 msgstr ""
 "Kunne ikke oprette mappe `%s':\n"
 "%s"
 
-#: mail/mail-crypto.c:271
+#: mail/mail-crypto.c:267
 #, fuzzy
 msgid "Could not create a S/MIME envelope context."
 msgstr "Kunne ikke koble til POP-tjener p� %s."
 
-#: mail/mail-crypto.c:301
+#: mail/mail-crypto.c:297
 #, fuzzy
 msgid "Could not create a S/MIME decode context."
 msgstr ""
@@ -9535,12 +9629,12 @@ msgstr "_�pne i nytt vindu"
 msgid "Copy Link Location"
 msgstr "Kopi�r placering (RETMIG)"
 
-#: mail/mail-display.c:1519
+#: mail/mail-display.c:1520
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "Gem som (RETMIG)"
 
-#: mail/mail-display.c:1521
+#: mail/mail-display.c:1523
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Gem som..."
@@ -9558,88 +9652,88 @@ msgstr ""
 msgid "Date"
 msgstr "Dato"
 
-#: mail/mail-format.c:860
+#: mail/mail-format.c:862
 #, fuzzy
 msgid "Bad Address"
 msgstr "Epostadresse:"
 
-#: mail/mail-format.c:882 mail/message-list.etspec.h:3
+#: mail/mail-format.c:903 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "Afsender"
 
-#: mail/mail-format.c:885
+#: mail/mail-format.c:906
 #, fuzzy
 msgid "Reply-To"
 msgstr "Svar-til:"
 
-#: mail/mail-format.c:888 mail/message-list.etspec.h:10
+#: mail/mail-format.c:910 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Modtager"
 
-#: mail/mail-format.c:891
+#: mail/mail-format.c:914
 #, fuzzy
 msgid "Cc"
 msgstr "Kopi:"
 
-#: mail/mail-format.c:1311
+#: mail/mail-format.c:1357
 msgid "No GPG/PGP program configured."
 msgstr ""
 
-#: mail/mail-format.c:1327
+#: mail/mail-format.c:1373
 msgid "Encrypted message not displayed"
 msgstr "Krypteret besked ikke vist"
 
-#: mail/mail-format.c:1338
+#: mail/mail-format.c:1384
 msgid "Encrypted message"
 msgstr "Krypteret besked"
 
-#: mail/mail-format.c:1339
+#: mail/mail-format.c:1385
 msgid "Click icon to decrypt."
 msgstr "Klik p� ikonen for at dekryptere."
 
-#: mail/mail-format.c:1394
+#: mail/mail-format.c:1440
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Denne besked er underskrevet digitalt og er fundet autentisk."
 
-#: mail/mail-format.c:1405
+#: mail/mail-format.c:1451
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "Denne besked er underskrevet digitalt, men er ikke fundet autentisk."
 
-#: mail/mail-format.c:2083
+#: mail/mail-format.c:2128
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peger til FTP-tjener (%s)"
 
-#: mail/mail-format.c:2097
+#: mail/mail-format.c:2142
 #, 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:2102
+#: mail/mail-format.c:2147
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peger til lokal fil (%s)"
 
-#: mail/mail-format.c:2131
+#: mail/mail-format.c:2176
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Peger til FTP-tjener (%s)"
 
-#: mail/mail-format.c:2139
+#: mail/mail-format.c:2184
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peger til ukendt eksternt data (\"%s\"-type)"
 
-#: mail/mail-format.c:2144
+#: mail/mail-format.c:2189
 msgid "Malformed external-body part."
 msgstr "Fejludformet del for ekstern-krop."
 
-#: mail/mail-local.c:547
+#: mail/mail-local.c:563
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "_Rekonfigur�r mappe"
 
-#: mail/mail-local.c:620
+#: mail/mail-local.c:636
 #, fuzzy, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -9648,29 +9742,29 @@ msgstr ""
 "Kan ikke gemme metainformation for mappe; du vil sandsynligvis\n"
 "ikke kunne �bne denne mappe igen: %s"
 
-#: mail/mail-local.c:676
+#: mail/mail-local.c:689
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Kan ikke f� fat p� mappe: %s: %s"
 
-#: mail/mail-local.c:722
+#: mail/mail-local.c:735
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 "Kunne ikke slette mappen `%s'\n"
 "%s"
 
-#: mail/mail-local.c:1052
+#: mail/mail-local.c:1075
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "�ndrer mappe \"%s\" til \"%s\" format"
 
-#: mail/mail-local.c:1067
+#: mail/mail-local.c:1090
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1089
+#: mail/mail-local.c:1112
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -9678,19 +9772,19 @@ msgstr ""
 "Hvis du ikke kan �bne denne postboks igen skal\n"
 "du reparere den manuelt."
 
-#: mail/mail-local.c:1180
+#: mail/mail-local.c:1200
 #, fuzzy
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 "Du kan kun redigere beskeder lagret\n"
 "i Skitse-kataloget."
 
-#: mail/mail-local.c:1190
+#: mail/mail-local.c:1209
 #, fuzzy, c-format
-msgid "Reconfigure %s"
+msgid "Reconfigure /%s"
 msgstr "Konfigur�r %s"
 
-#: mail/mail-mt.c:188
+#: mail/mail-mt.c:199
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -9699,7 +9793,7 @@ msgstr ""
 "Fejl ved '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:191
+#: mail/mail-mt.c:202
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -9709,21 +9803,25 @@ msgstr ""
 "%s"
 
 #. Remember the password?
-#: mail/mail-mt.c:454
+#: mail/mail-mt.c:509
 msgid "Remember this password"
 msgstr "Husk denne adgangskode"
 
-#: mail/mail-mt.c:511
+#: mail/mail-mt.c:510
+msgid "Remember this password for the remainder of this session"
+msgstr ""
+
+#: mail/mail-mt.c:567
 #, fuzzy, c-format
 msgid "Enter Password for %s"
 msgstr "Indtast adgangskode for %s"
 
-#: mail/mail-mt.c:514
+#: mail/mail-mt.c:570
 #, fuzzy
 msgid "Enter Password"
 msgstr "Indtast adgangskode for %s"
 
-#: mail/mail-mt.c:824
+#: mail/mail-mt.c:886
 msgid "Working"
 msgstr "Arbejder"
 
@@ -9881,6 +9979,11 @@ msgstr "Kan ikke skrive data: %s"
 msgid "Disconnecting from %s"
 msgstr "Epost fra %s"
 
+#: mail/mail-ops.c:2065
+#, fuzzy, c-format
+msgid "Reconnecting to %s"
+msgstr "Epost fra %s"
+
 #: mail/mail-search-dialogue.c:113
 msgid "_Search"
 msgstr "_S�g"
@@ -9939,12 +10042,12 @@ msgstr ""
 msgid "Type: %s"
 msgstr "Type:"
 
-#: mail/mail-send-recv.c:282
+#: mail/mail-send-recv.c:283
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "Send & modtag e-post"
 
-#: mail/mail-send-recv.c:283
+#: mail/mail-send-recv.c:284
 #, fuzzy
 msgid "Cancel All"
 msgstr "Annull�r"
@@ -9966,36 +10069,50 @@ msgstr "Afbrudt"
 msgid "User canceled operation."
 msgstr "Handling annulleret"
 
-#: mail/mail-tools.c:173
+#: mail/mail-tools.c:133
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Kunne ikke oprette midlertidig mbox '%s': %s"
 
-#: mail/mail-tools.c:299
+#: mail/mail-tools.c:259
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Videresendt meddelelse - %s"
 
-#: mail/mail-tools.c:303
+#: mail/mail-tools.c:263
 #, fuzzy
 msgid "Forwarded message"
 msgstr "Videresendte meddelelser"
 
-#: mail/mail-tools.c:439
+#: mail/mail-tools.c:396
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "Videresendte meddelelser"
 
-#: mail/mail-vfolder.c:161
+#: mail/mail-vfolder.c:84
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Opretter en ny mappe"
 
-#: mail/mail-vfolder.c:435
+#: mail/mail-vfolder.c:201
+#, fuzzy, c-format
+msgid "Updating vfolders for uri: %s"
+msgstr "�bner mappe %s"
+
+#: mail/mail-vfolder.c:414
+#, c-format
+msgid ""
+"The following vFolder(s):\n"
+"%sUsed the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+
+#: mail/mail-vfolder.c:636
 msgid "VFolders"
 msgstr "vMapper"
 
-#: mail/mail-vfolder.c:541
+#: mail/mail-vfolder.c:742
 msgid "New VFolder"
 msgstr "Ny vMappe"
 
@@ -10065,7 +10182,7 @@ msgstr "%a %H:%M"
 msgid "%b %d %Y"
 msgstr "%a %d %Y"
 
-#: mail/message-list.c:2331
+#: mail/message-list.c:2334
 #, fuzzy
 msgid "Generating message list"
 msgstr "Tr�det meddelelsesliste"
@@ -10159,34 +10276,34 @@ msgstr "Opsig abonnement"
 msgid "Evolution component for the executive summary."
 msgstr ""
 
-#: my-evolution/component-factory.c:30
+#: my-evolution/component-factory.c:45
 msgid "Folder containing the Evolution Summary"
 msgstr ""
 
-#: my-evolution/component-factory.c:139
+#: my-evolution/component-factory.c:154
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:248 my-evolution/e-summary-calendar.c:266
+#: my-evolution/e-summary-calendar.c:263 my-evolution/e-summary-calendar.c:281
 msgid "Appointments"
 msgstr "Aftaler"
 
-#: my-evolution/e-summary-calendar.c:249
+#: my-evolution/e-summary-calendar.c:264
 #, fuzzy
 msgid "No appointments"
 msgstr "Vis aftaler"
 
-#: my-evolution/e-summary-calendar.c:286
+#: my-evolution/e-summary-calendar.c:301
 #, fuzzy
 msgid "%k%M %d %B"
 msgstr "%A %d %B"
 
-#: my-evolution/e-summary-calendar.c:288
+#: my-evolution/e-summary-calendar.c:303
 #, fuzzy
 msgid "%l:%M %d %B"
 msgstr "%A %d %B"
 
-#: my-evolution/e-summary-mail.c:115
+#: my-evolution/e-summary-mail.c:130
 #, fuzzy
 msgid "Mail summary"
 msgstr "Sammendrag"
@@ -10195,92 +10312,92 @@ msgstr "Sammendrag"
 #. see in My Evolution by default. You can find the list of all
 #. stations and their codes in Evolution sources
 #. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-preferences.c:65
-#: my-evolution/e-summary-weather.c:615
+#: my-evolution/e-summary-preferences.c:80
+#: my-evolution/e-summary-weather.c:630
 msgid "KBOS:ZSAM:EGAA"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:427
+#: my-evolution/e-summary-preferences.c:441
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:449
+#: my-evolution/e-summary-preferences.c:463
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:890
+#: my-evolution/e-summary-preferences.c:929
 #, fuzzy
 msgid "Add a news feed"
 msgstr "Tilf�j tjeneste"
 
-#: my-evolution/e-summary-preferences.c:898
+#: my-evolution/e-summary-preferences.c:937
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:902
+#: my-evolution/e-summary-preferences.c:941
 msgid "Name:"
 msgstr "Navn:"
 
-#: my-evolution/e-summary-preferences.c:1438
+#: my-evolution/e-summary-preferences.c:1486
 #, fuzzy
 msgid "Summary Settings"
 msgstr "Sammendrag indeholder"
 
-#: my-evolution/e-summary-rdf.c:277 my-evolution/e-summary-rdf.c:362
-#: my-evolution/e-summary-rdf.c:395
+#: my-evolution/e-summary-rdf.c:297 my-evolution/e-summary-rdf.c:382
+#: my-evolution/e-summary-rdf.c:415
 #, fuzzy
 msgid "Error downloading RDF"
 msgstr "<b>Fejl ved indl�sning af kalender</b>"
 
-#: my-evolution/e-summary-rdf.c:487
+#: my-evolution/e-summary-rdf.c:507
 #, fuzzy
 msgid "News Feed"
 msgstr "%s-tjener %s"
 
-#: my-evolution/e-summary-tasks.c:216
+#: my-evolution/e-summary-tasks.c:238
 #, fuzzy
 msgid "No tasks"
 msgstr "Vis opgaver"
 
-#: my-evolution/e-summary-tasks.c:255
+#: my-evolution/e-summary-tasks.c:277
 #, fuzzy
 msgid "(No Description)"
 msgstr "Beskrivelse:"
 
-#: my-evolution/e-summary-weather.c:57
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:334
+#: my-evolution/e-summary-weather.c:349
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:524
+#: my-evolution/e-summary-weather.c:539
 #, fuzzy
 msgid "Weather"
 msgstr "Andet"
 
-#: my-evolution/e-summary-weather.c:676
+#: my-evolution/e-summary-weather.c:691
 #, fuzzy
 msgid "Regions"
 msgstr "Sektioner:"
 
-#: my-evolution/e-summary.c:162
+#: my-evolution/e-summary.c:187
 #, fuzzy
 msgid "%A, %B %e %Y"
 msgstr "%A den %e. %B %Y"
 
-#: my-evolution/e-summary.c:512 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:568 ui/my-evolution.xml.h:3
 #, fuzzy
 msgid "Print Summary"
 msgstr "Sammendrag"
 
-#: my-evolution/e-summary.c:558
+#: my-evolution/e-summary.c:614
 #, fuzzy
 msgid "Printing of Summary failed"
 msgstr "Udskrivning af besked mislykkedes"
 
-#: my-evolution/main.c:52
+#: my-evolution/main.c:67
 #, fuzzy
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
@@ -11761,43 +11878,43 @@ msgstr ""
 "Venligst fjern denne for at tillade installation\n"
 "af Evolution's brugerfiler."
 
-#: shell/e-shell-folder-commands.c:174
+#: shell/e-shell-folder-commands.c:176
 #, fuzzy
 msgid "Cannot move a folder over itself."
 msgstr "Kan ikke f� fat p� mappe: %s: %s"
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:178
 #, fuzzy
 msgid "Cannot copy a folder over itself."
 msgstr ""
 "Kan ikke kopiere filer til\n"
 "'%s'."
 
-#: shell/e-shell-folder-commands.c:190
+#: shell/e-shell-folder-commands.c:192
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:294
+#: shell/e-shell-folder-commands.c:312
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:299
+#: shell/e-shell-folder-commands.c:317
 #, fuzzy
 msgid "Copy folder"
 msgstr "Kopi�r til mappe"
 
-#: shell/e-shell-folder-commands.c:337
+#: shell/e-shell-folder-commands.c:359
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:342
+#: shell/e-shell-folder-commands.c:364
 #, fuzzy
 msgid "Move folder"
 msgstr "Flyt til folder"
 
-#: shell/e-shell-folder-commands.c:367
+#: shell/e-shell-folder-commands.c:390
 #, fuzzy, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -11806,34 +11923,35 @@ msgstr ""
 "Kunne ikke slette mappen `%s'\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:383
+#: shell/e-shell-folder-commands.c:406
 #, fuzzy, c-format
-msgid "Delete folder '%s'"
-msgstr "V�lg mappe"
+msgid "Delete \"%s\""
+msgstr "Slet"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:393
+#: shell/e-shell-folder-commands.c:416
 #, fuzzy, c-format
-msgid "Are you sure you want to remove the '%s' folder?"
+msgid "Are you sure you want to remove the \"%s\" folder?"
 msgstr "Er du sikker p� at du vil slette opgaven '%s'?"
 
-#. Popup a dialog asking what the user would like to rename
-#. the folder to
-#: shell/e-shell-folder-commands.c:468
+#: shell/e-shell-folder-commands.c:470
 #, fuzzy, c-format
-msgid "Rename folder '%s'"
+msgid ""
+"Cannot rename folder:\n"
+"%s"
+msgstr ""
+"Kunne ikke slette mappen `%s'\n"
+"%s"
+
+#: shell/e-shell-folder-commands.c:503
+#, fuzzy, c-format
+msgid "Rename the \"%s\" folder to:"
 msgstr "�bner mappe %s"
 
-#: shell/e-shell-folder-commands.c:472
+#: shell/e-shell-folder-commands.c:506
 #, fuzzy
-msgid "Rename"
-msgstr "Regelnavn: "
-
-#. Make, pack the label
-#: shell/e-shell-folder-commands.c:480
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "Mappenavn:"
+msgid "Rename folder"
+msgstr "�bner mappe %s"
 
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
@@ -11871,7 +11989,7 @@ msgstr "Det angivne katalognavn er ikke gyldigt."
 msgid "Evolution - Create new folder"
 msgstr "Evolution - opret ny mappe"
 
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:99
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -11879,7 +11997,7 @@ msgstr ""
 "Typen p� den valgte mappe er ikke gyldig til\n"
 "den �nskede operation."
 
-#: shell/e-shell-folder-selection-dialog.c:348
+#: shell/e-shell-folder-selection-dialog.c:360
 msgid "New..."
 msgstr "Ny..."
 
@@ -11887,7 +12005,11 @@ msgstr "Ny..."
 msgid "(Untitled)"
 msgstr "(Unavngivet)"
 
-#: shell/e-shell-importer.c:102
+#: shell/e-shell-importer.c:141
+msgid "Choose the type of importer to run"
+msgstr ""
+
+#: shell/e-shell-importer.c:144
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -11901,9 +12023,13 @@ msgstr ""
 "Du kan v�lge \"Automatisk\" hvis du ikke ved det, s� vil Evolution pr�ve at "
 "finde ud af hvilken type det er, for dig."
 
+#: shell/e-shell-importer.c:150
+msgid "Please select the information that you would like to import"
+msgstr ""
+
 #. Importer isn't ready yet.
 #. Wait 5 seconds and try again.
-#: shell/e-shell-importer.c:197
+#: shell/e-shell-importer.c:242
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11914,7 +12040,7 @@ msgstr ""
 "Import�r ikke klar.\n"
 "Venter 5 sekunder f�r nyt fors�g."
 
-#: shell/e-shell-importer.c:217 shell/e-shell-importer.c:248
+#: shell/e-shell-importer.c:262 shell/e-shell-importer.c:293
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11923,16 +12049,16 @@ msgstr ""
 "Importerer %s\n"
 "Importerer opf�ring %d."
 
-#: shell/e-shell-importer.c:351
+#: shell/e-shell-importer.c:396
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "Mappen `%s' eksisterer ikke."
 
-#: shell/e-shell-importer.c:363
+#: shell/e-shell-importer.c:408
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:378
+#: shell/e-shell-importer.c:423
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -11941,11 +12067,11 @@ msgstr ""
 "Der er ingen import�r som kan h�ndtere\n"
 "%s"
 
-#: shell/e-shell-importer.c:388
+#: shell/e-shell-importer.c:433
 msgid "Importing"
 msgstr "Importerer"
 
-#: shell/e-shell-importer.c:396
+#: shell/e-shell-importer.c:441
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -11954,17 +12080,17 @@ msgstr ""
 "Importerer %s.\n"
 "Starter %s"
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:454
 #, c-format
 msgid "Error starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:428
+#: shell/e-shell-importer.c:473
 #, c-format
 msgid "Error loading %s"
 msgstr "Fejl under indl�sning af %s"
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:490
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11973,31 +12099,55 @@ msgstr ""
 "Importerer %s\n"
 "Importerer opf�ring 1."
 
-#: shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:560
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: shell/e-shell-importer.c:566
+#: shell/e-shell-importer.c:611
 msgid "Filename:"
 msgstr "Filnavn:"
 
-#: shell/e-shell-importer.c:571
+#: shell/e-shell-importer.c:616
 msgid "Select a file"
 msgstr "V�lg fil"
 
-#: shell/e-shell-importer.c:581
+#: shell/e-shell-importer.c:626
 msgid "File type:"
 msgstr "Filtype:"
 
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:651
+msgid "Import data and settings from older programs"
+msgstr ""
+
+#: shell/e-shell-importer.c:655
+#, fuzzy
+msgid "Import a single file"
+msgstr "Importerer"
+
+#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:582
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:585
+msgid "Starting Intelligent Importers"
+msgstr ""
+
+#: shell/e-shell-importer.c:840 shell/e-shell-startup-wizard.c:703
+#, fuzzy, c-format
+msgid "From %s:"
+msgstr "Fra:"
+
+#: shell/e-shell-importer.c:1003
 msgid "Select folder"
 msgstr "V�lg mappe"
 
-#: shell/e-shell-importer.c:646
+#: shell/e-shell-importer.c:1004
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:689 shell/importer/intelligent.c:194
+#: shell/e-shell-importer.c:1116 shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "Import�r"
 
@@ -12017,45 +12167,30 @@ msgstr ""
 msgid "Cannot initialize the Evolution Mailer Wizard interface"
 msgstr "Kan ikke initialisere Evolutions e-postkomponent."
 
-#: shell/e-shell-startup-wizard.c:582
-msgid ""
-"Please wait...\n"
-"Scanning for existing setups"
-msgstr ""
-
-#: shell/e-shell-startup-wizard.c:585
-msgid "Starting Intelligent Importers"
-msgstr ""
-
-#: shell/e-shell-startup-wizard.c:703
-#, fuzzy, c-format
-msgid "From %s:"
-msgstr "Fra:"
-
 #: shell/e-shell-startup-wizard.c:745
 msgid ""
 "Please select the information\n"
 "that you would like to import"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:183
+#: shell/e-shell-view-menu.c:201
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Fejl-Frede fandtes ikke i din $PATH"
 
-#: shell/e-shell-view-menu.c:191
+#: shell/e-shell-view-menu.c:209
 msgid "Bug buddy could not be run."
 msgstr "Fejl-Frede kunne ikke k�res"
 
-#: shell/e-shell-view-menu.c:217
+#: shell/e-shell-view-menu.c:235
 #, fuzzy
 msgid "Ximian Evolution"
 msgstr "Evolution"
 
-#: shell/e-shell-view-menu.c:219
+#: shell/e-shell-view-menu.c:237
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Ophavsret tilh�rende Ximian, Inc. 1999-2001."
 
-#: shell/e-shell-view-menu.c:221
+#: shell/e-shell-view-menu.c:239
 #, fuzzy
 msgid ""
 "Ximian Evolution is a suite of groupware applications\n"
@@ -12066,29 +12201,38 @@ msgstr ""
 "til administrering af post, kalender og aftaler\n"
 "indenfor Gnomes skrivebordsmilj�."
 
-#: shell/e-shell-view-menu.c:424
+#: shell/e-shell-view-menu.c:442
 msgid "Go to folder..."
 msgstr "G� til mappe..."
 
-#: shell/e-shell-view-menu.c:425
+#: shell/e-shell-view-menu.c:443
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:570
+#: shell/e-shell-view-menu.c:563
 #, fuzzy
 msgid "Create a new shortcut"
 msgstr "Opret en ny genvejsgruppe"
 
-#: shell/e-shell-view-menu.c:571
+#: shell/e-shell-view-menu.c:564
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:685
+#: shell/e-shell-view-menu.c:595
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:603
+#, fuzzy, c-format
+msgid "Error executing %s."
+msgstr "Fejl under indl�sning af %s"
+
+#: shell/e-shell-view-menu.c:705
 #, fuzzy
 msgid "Work Online"
 msgstr "Arbejd p� nettet"
 
-#: shell/e-shell-view-menu.c:698 shell/e-shell-view-menu.c:711
+#: shell/e-shell-view-menu.c:718 shell/e-shell-view-menu.c:731
 #: ui/evolution.xml.h:30
 msgid "Work Offline"
 msgstr ""
@@ -12097,46 +12241,46 @@ msgstr ""
 msgid "(No folder displayed)"
 msgstr "(Ingen mappe vist)"
 
-#: shell/e-shell-view.c:1478
+#: shell/e-shell-view.c:1512
 #, c-format
 msgid "%s (%d)"
 msgstr ""
 
-#: shell/e-shell-view.c:1480
+#: shell/e-shell-view.c:1514
 #, fuzzy
 msgid "(None)"
 msgstr "(Uden navn)"
 
-#: shell/e-shell-view.c:1485
+#: shell/e-shell-view.c:1519
 #, fuzzy, c-format
 msgid "%s - Ximian Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1487
+#: shell/e-shell-view.c:1521
 #, fuzzy, c-format
 msgid "%s - Ximian Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell-view.c:1527
+#: shell/e-shell-view.c:1561
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1534
+#: shell/e-shell-view.c:1568
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1540
+#: shell/e-shell-view.c:1574
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:560
+#: shell/e-shell.c:562
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan ikke ops�tte lokal gemning -- %s"
 
-#: shell/e-shell.c:1496
+#: shell/e-shell.c:1488
 #, fuzzy, c-format
 msgid ""
 "Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
@@ -12145,26 +12289,26 @@ msgstr ""
 "Ups! Visningen for `%s' d�de uventet. :-(\n"
 "Dette betyder sandsynligvis at %s komponenten er brudt ned."
 
-#: shell/e-shell.c:1700 widgets/misc/e-cell-date-edit.c:248
+#: shell/e-shell.c:1692 widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "O.k."
 
-#: shell/e-shell.c:1702
+#: shell/e-shell.c:1694
 #, fuzzy
 msgid "Invalid arguments"
 msgstr "Ugyldigt indhold af meddelelse"
 
-#: shell/e-shell.c:1704
+#: shell/e-shell.c:1696
 #, fuzzy
 msgid "Cannot register on OAF"
 msgstr "Kan ikke registrere gemning i skallen"
 
-#: shell/e-shell.c:1706
+#: shell/e-shell.c:1698
 #, fuzzy
 msgid "Configuration Database not found"
 msgstr "Konfiguration af epost"
 
-#: shell/e-shell.c:1708 shell/e-storage.c:491
+#: shell/e-shell.c:1700 shell/e-storage.c:496
 msgid "Generic error"
 msgstr "Almindelig fejl"
 
@@ -12302,52 +12446,61 @@ msgstr "Fejl under gemning af genveje."
 msgid "Shortcuts"
 msgstr "_Genvejsbj�lke"
 
+#: shell/e-storage-set-view.c:645
+#, fuzzy, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr ""
+"Kunne ikke slette mappen `%s'\n"
+"%s"
+
 #: shell/e-storage.c:182 shell/e-storage.c:188
 msgid "(No name)"
 msgstr "(Uden navn)"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:494
 msgid "No error"
 msgstr "Ingen fejl"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:498
 msgid "A folder with the same name already exists"
 msgstr "En mappe med samme navn eksisterer allerede"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:500
 msgid "The specified folder type is not valid"
 msgstr "Specificeret mappetype er ikke gyldig"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:502
 msgid "I/O error"
 msgstr "I/U-fejl"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:504
 msgid "Not enough space to create the folder"
 msgstr "Ikke nok plads til at oprette mappen"
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:506
 msgid "The specified folder was not found"
 msgstr "Angivet mappe blev ikke fundet"
 
-#: shell/e-storage.c:503
+#: shell/e-storage.c:508
 msgid "Function not implemented in this storage"
 msgstr "Funktionen ikke implementeret i denne gemning"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:512
 msgid "Operation not supported"
 msgstr "Operationen er ikke underst�ttet"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:514
 msgid "The specified type is not supported in this storage"
 msgstr "Den angivne type er ikke underst�ttet i denne gemning"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:516
 #, fuzzy
 msgid "The specified folder cannot be modified or removed"
 msgstr "Angivet mappe blev ikke fundet"
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:518
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
@@ -12379,6 +12532,10 @@ msgstr "V�rt:"
 msgid "The following connections are currently active:"
 msgstr ""
 
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr "Mappenavn:"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder type:"
 msgstr "Mappetype:"
@@ -12435,15 +12592,25 @@ msgid "Evolution Importer Assistant"
 msgstr "Evolution import�rprogram"
 
 #: shell/importer/import.glade.h:4
-msgid "Import File (Step 2 of 2)"
-msgstr ""
+#, fuzzy
+msgid "Import File (step 3 of 3)"
+msgstr "V�lg fil"
 
 #: shell/importer/import.glade.h:5
+msgid "Importer Type (step 1 of 3)"
+msgstr ""
+
+#: shell/importer/import.glade.h:6
 #, fuzzy
-msgid "Select a File (step 1 of 2)"
+msgid "Select Importers (step 2 of 3)"
 msgstr "V�lg fil"
 
-#: shell/importer/import.glade.h:6
+#: shell/importer/import.glade.h:7
+#, fuzzy
+msgid "Select a File (step 2 of 3)"
+msgstr "V�lg fil"
+
+#: shell/importer/import.glade.h:8
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
@@ -12687,13 +12854,6 @@ msgstr "_S�g efter kontakter"
 msgid "_Select All"
 msgstr "V�lg alle"
 
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:44
-#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
-#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:19
-#: ui/my-evolution.xml.h:9
-msgid "_Tools"
-msgstr "_V�rkt�j"
-
 #: ui/evolution-calendar.xml.h:2
 #, fuzzy
 msgid "Configure the calendar's settings"
@@ -12886,8 +13046,8 @@ msgstr "�ndr visningen til %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:49
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:36
 msgid "_File"
 msgstr "_Fil"
@@ -12908,8 +13068,8 @@ msgstr "Gem kontakten og luk dialogboksen"
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:54
-#: ui/evolution-signature-editor.xml.h:11
+#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Save"
 msgstr "_Gem"
 
@@ -13589,6 +13749,11 @@ msgstr "Vis"
 msgid "_Open Message"
 msgstr "Send beskeder _igen"
 
+#: ui/evolution-mail-message.xml.h:98 ui/evolution.xml.h:49
+#: ui/my-evolution.xml.h:9
+msgid "_Tools"
+msgstr "_V�rkt�j"
+
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Luk dette vindue"
@@ -13600,8 +13765,8 @@ msgstr "Luk dette vindue"
 msgid "_Close"
 msgstr "L_uk"
 
-#: ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:48
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:50
 msgid "_View"
 msgstr "_Vis"
 
@@ -13767,37 +13932,32 @@ msgid "_Cc Field"
 msgstr "_Kopifelt"
 
 #: ui/evolution-message-composer.xml.h:46
-#: ui/evolution-signature-editor.xml.h:6
-msgid "_Debug"
-msgstr "_Fejls�g"
-
-#: ui/evolution-message-composer.xml.h:47
 #, fuzzy
 msgid "_Delete all"
 msgstr "_Slet"
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:49
 msgid "_From Field"
 msgstr "_Fra-felt"
 
-#: ui/evolution-message-composer.xml.h:51
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-signature-editor.xml.h:9
 msgid "_Insert"
 msgstr "_inds�t"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:51
 msgid "_Open..."
 msgstr "_�bn..."
 
-#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Reply-To Field"
 msgstr "_Svar-til-felt"
 
-#: ui/evolution-message-composer.xml.h:55
+#: ui/evolution-message-composer.xml.h:54
 msgid "_Security"
 msgstr "_Sikkerhed"
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "_Hj�lp"
 
@@ -13949,7 +14109,7 @@ msgid "Exit the program"
 msgstr "Afslut program"
 
 #: ui/evolution.xml.h:15
-msgid "Import an external file format"
+msgid "Import data from other programs"
 msgstr ""
 
 #: ui/evolution.xml.h:17
@@ -14031,8 +14191,8 @@ msgstr "_G� til mappe..."
 
 #: ui/evolution.xml.h:41
 #, fuzzy
-msgid "_Import File..."
-msgstr "_Import�r fil..."
+msgid "_Import..."
+msgstr "Importerer"
 
 #: ui/evolution.xml.h:42
 #, fuzzy
@@ -14049,19 +14209,24 @@ msgstr "_Ny Mappe"
 
 #: ui/evolution.xml.h:45
 #, fuzzy
+msgid "_Pilot Settings..."
+msgstr "Indstillinger for _post..."
+
+#: ui/evolution.xml.h:46
+#, fuzzy
 msgid "_Rename..."
 msgstr "_�bn..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:47
 #, fuzzy
 msgid "_Shortcut"
 msgstr "_Genvejsbj�lke"
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:48
 msgid "_Shortcut Bar"
 msgstr "_Genvejsbj�lke"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:51
 #, fuzzy
 msgid "_Work Offline"
 msgstr "Arbejder"
@@ -14168,11 +14333,11 @@ msgstr "MTOTFLS"
 msgid "%B %Y"
 msgstr "%a %d %Y"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:433
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:439
 msgid "Now"
 msgstr "Nu"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:445
 msgid "Today"
 msgstr "I dag"
 
@@ -14325,21 +14490,60 @@ msgstr "Den personlige adressebogsserver"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr ""
 
-#: wombat/wombat.c:175
+#: wombat/wombat.c:176
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr ""
 
-#: wombat/wombat.c:187
+#: wombat/wombat.c:188
 msgid "init_corba(): could not initialize GNOME"
 msgstr ""
 
-#: wombat/wombat.c:200
+#: wombat/wombat.c:201
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 
 #, fuzzy
-#~ msgid "Cannot open folder: %s: No such folder"
-#~ msgstr "Kan ikke f� fat p� mappe: %s: %s"
+#~ msgid "_Calendar Information:"
+#~ msgstr "Kalenderinformation"
+
+#~ msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
+#~ msgstr ""
+#~ "Prioriteten skal v�re en af 'H�j', 'Normal', 'Lav' eller 'Udefineret'."
+
+#, fuzzy
+#~ msgid "before start of appointment"
+#~ msgstr " f�r begyndelse p� aftale"
+
+#, fuzzy
+#~ msgid "after start of appointment"
+#~ msgstr " efter begyndelse p� aftale"
+
+#, fuzzy
+#~ msgid "before end of appointment"
+#~ msgstr " f�r slutning p� aftale"
+
+#, fuzzy
+#~ msgid "Evolution Shortcuts"
+#~ msgstr "Evolution fremgang"
+
+#, fuzzy
+#~ msgid "Each account must have a different name."
+#~ msgstr "Gem aktiv fil med et andet navn"
+
+#, fuzzy
+#~ msgid "Delete folder '%s'"
+#~ msgstr "V�lg mappe"
+
+#, fuzzy
+#~ msgid "Rename"
+#~ msgstr "Regelnavn: "
+
+#~ msgid "_Debug"
+#~ msgstr "_Fejls�g"
+
+#, fuzzy
+#~ msgid "_Import File..."
+#~ msgstr "_Import�r fil..."
 
 #~ msgid "Factory for the Evolution addressbook component."
 #~ msgstr "Fabrik for Evolutions adressebog-komponent."
@@ -15059,9 +15263,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgid "Renaming old folder and opening"
 #~ msgstr "�ndrer navn p� gammel mappe og gen�bner"
 
-#~ msgid "Copying messages"
-#~ msgstr "Kopierer beskeder"
-
 #~ msgid "Retrieving message number %d of %d (uid \"%s\")"
 #~ msgstr "Henter besked nummer %d af %d (uid \"%s\")"
 
@@ -15631,10 +15832,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ msgstr "er lik regex"
 
 #, fuzzy
-#~ msgid "Opening Trash folder for %s"
-#~ msgstr "�bner mappe %s"
-
-#, fuzzy
 #~ msgid "Attachment (FIXME: implement me)"
 #~ msgstr "Omdirig�r"
 
@@ -16454,10 +16651,6 @@ msgstr "init_bonobo(): Kunne ikke initiere Bonobo"
 #~ " %s"
 
 #, fuzzy
-#~ msgid "Cannot append message to mh folder: %s"
-#~ msgstr "Kan ikke tilf�je besked i mh-mappe: %s: %s"
-
-#, fuzzy
 #~ msgid "Could not rename folder `%s': %s"
 #~ msgstr "Kunne ikke �ndre navn p� mappe: %s"
 
diff --git a/po/de.po b/po/de.po
index 3f47be6b64..8a3c42e65e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-0.8cvs\n"
-"POT-Creation-Date: 2001-09-21 18:31-0400\n"
+"POT-Creation-Date: 2001-10-01 19:06-0400\n"
 "PO-Revision-Date: 2001-09-08 17:32+02:00\n"
 "Last-Translator: Matthias Warkus <mawarkus@gnome.org>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -36,277 +36,277 @@ msgid "Name"
 msgstr "Name"
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-msgid "Family Name"
-msgstr "Familienname"
-
-#: addressbook/backend/ebook/e-card-simple.c:61
 #: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Email"
 msgstr "E-Mail"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:61
 #: addressbook/gui/contact-editor/e-contact-editor.c:1609
 msgid "Primary"
 msgstr "Prim�r"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:61
 msgid "Prim"
 msgstr "Prim"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:92
 #: addressbook/gui/contact-editor/e-contact-editor.c:1594
 #: addressbook/gui/widgets/e-addressbook-view.c:902
 msgid "Assistant"
 msgstr "Assistent"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/gui/contact-editor/e-contact-editor.c:1595
 #: addressbook/gui/contact-editor/e-contact-editor.c:1662
 msgid "Business"
 msgstr "Gesch�ftlich"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/backend/ebook/e-card-simple.c:68
 msgid "Bus"
 msgstr "Gesch�ft"
 
-#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/gui/contact-editor/e-contact-editor.c:1598
 msgid "Callback"
 msgstr "R�ckruf"
 
-#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/gui/contact-editor/e-contact-editor.c:1600
 msgid "Company"
 msgstr "Firma"
 
-#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:65
 msgid "Comp"
 msgstr "Fa."
 
-#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:69
 #: addressbook/gui/contact-editor/e-contact-editor.c:1601
 #: addressbook/gui/contact-editor/e-contact-editor.c:1663
 msgid "Home"
 msgstr "Zu Hause"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:67
 #: addressbook/gui/widgets/e-addressbook-view.c:877
 msgid "Organization"
 msgstr "Organisation"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:67
 msgid "Org"
 msgstr "Org"
 
-#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/e-contact-editor.c:1605
 msgid "Mobile"
 msgstr "Mobil"
 
-#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/e-contact-editor.c:1599
 msgid "Car"
 msgstr "Auto"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/e-contact-editor.c:1597
 #: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "Business Fax"
 msgstr "Gesch�ftliches Fax"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/backend/ebook/e-card-simple.c:72
 msgid "Bus Fax"
 msgstr "Gesch. Fax"
 
-#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/backend/ebook/e-card-simple.c:73
 #: addressbook/gui/contact-editor/e-contact-editor.c:1603
 #: addressbook/gui/widgets/e-addressbook-view.c:883
 msgid "Home Fax"
 msgstr "Fax zu Hause"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/e-contact-editor.c:1596
 msgid "Business 2"
 msgstr "Gesch�ftlich 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/backend/ebook/e-card-simple.c:74
 msgid "Bus 2"
 msgstr "Gesch�ft 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/backend/ebook/e-card-simple.c:75
 #: addressbook/gui/contact-editor/e-contact-editor.c:1602
 msgid "Home 2"
 msgstr "Zu Hause 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/backend/ebook/e-card-simple.c:76
 #: addressbook/gui/contact-editor/e-contact-editor.c:1604
 #: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/backend/ebook/e-card-simple.c:83
 #: addressbook/gui/contact-editor/e-contact-editor.c:1606
 #: addressbook/gui/contact-editor/e-contact-editor.c:1664
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:52
 msgid "Other"
 msgstr "Andere"
 
-#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/backend/ebook/e-card-simple.c:78
 #: addressbook/gui/contact-editor/e-contact-editor.c:1607
 #: addressbook/gui/widgets/e-addressbook-view.c:888
 msgid "Other Fax"
 msgstr "Anderes Fax"
 
-#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/gui/contact-editor/e-contact-editor.c:1608
 #: addressbook/gui/widgets/e-addressbook-view.c:889
 msgid "Pager"
 msgstr "Pager"
 
-#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/backend/ebook/e-card-simple.c:80
 #: addressbook/gui/contact-editor/e-contact-editor.c:1610
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 msgid "Radio"
 msgstr "Funk"
 
-#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/backend/ebook/e-card-simple.c:81
 #: addressbook/gui/contact-editor/e-contact-editor.c:1611
 #: addressbook/gui/widgets/e-addressbook-view.c:891
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/backend/ebook/e-card-simple.c:82
 #: addressbook/gui/widgets/e-addressbook-view.c:892
 msgid "TTY"
 msgstr "Telex"
 
-#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/backend/ebook/e-card-simple.c:84
 #: addressbook/gui/component/e-address-popup.c:476
 #: addressbook/gui/contact-editor/e-contact-editor.c:1637
 #: addressbook/gui/widgets/e-addressbook-view.c:894
 msgid "Email 2"
 msgstr "E-Mail 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/backend/ebook/e-card-simple.c:85
 #: addressbook/gui/component/e-address-popup.c:486
 #: addressbook/gui/contact-editor/e-contact-editor.c:1638
 #: addressbook/gui/widgets/e-addressbook-view.c:895
 msgid "Email 3"
 msgstr "E-Mail 3"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/widgets/e-addressbook-view.c:896
 msgid "Web Site"
 msgstr "Website"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:86
 msgid "Url"
 msgstr "URL"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/widgets/e-addressbook-view.c:897
 msgid "Department"
 msgstr "Abteilung"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:87
 msgid "Dep"
 msgstr "Abt"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/backend/ebook/e-card-simple.c:88
 #: addressbook/gui/widgets/e-addressbook-view.c:898
 msgid "Office"
 msgstr "B�ro"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/backend/ebook/e-card-simple.c:88
 msgid "Off"
 msgstr "B�ro"
 
-#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card-simple.c:89
 #: addressbook/gui/widgets/e-addressbook-view.c:899
 msgid "Title"
 msgstr "Titel"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:90
 #: addressbook/gui/widgets/e-addressbook-view.c:900
 msgid "Profession"
 msgstr "Beruf"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Prof"
 msgstr "Beruf"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:91
 #: addressbook/gui/widgets/e-addressbook-view.c:901
 msgid "Manager"
 msgstr "Vorgesetzter"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:91
 msgid "Man"
 msgstr "Chef"
 
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:92
 msgid "Ass"
 msgstr "Ass"
 
-#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card-simple.c:93
 #: addressbook/gui/widgets/e-addressbook-view.c:903
 msgid "Nickname"
 msgstr "Spitzname"
 
-#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card-simple.c:93
 msgid "Nick"
 msgstr "Spitzn."
 
-#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/backend/ebook/e-card-simple.c:94
 #: addressbook/gui/widgets/e-addressbook-view.c:904
 msgid "Spouse"
 msgstr "Lebenspartner"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card-simple.c:95
 #: addressbook/gui/widgets/e-addressbook-view.c:905
 msgid "Note"
 msgstr "Notiz"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:96
 #, fuzzy
 msgid "Calendar URI"
 msgstr "Kalender"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:96
 msgid "CALUri"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:97
 #: addressbook/gui/widgets/e-addressbook-view.c:906
 msgid "Free-busy URL"
 msgstr "Verf�gbarkeits-Adresse"
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:97
 msgid "FBUrl"
 msgstr "VURL"
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "Anniversary"
 msgstr "Jahrestag"
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "Anniv"
 msgstr "JTag"
 
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card-simple.c:99
 msgid "Birth Date"
 msgstr "Geburtsdatum"
 
-#: addressbook/backend/ebook/e-card-simple.c:103
+#: addressbook/backend/ebook/e-card-simple.c:102
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "Kategorien"
 
+#: addressbook/backend/ebook/e-card-simple.c:103
+msgid "Family Name"
+msgstr "Familienname"
+
 #: addressbook/backend/ebook/e-card.c:3564
 msgid "Card: "
 msgstr "Karte: "
@@ -606,10 +606,10 @@ msgstr "VCard f�r %s"
 #: 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:1119
+#: addressbook/conduit/address-conduit.c:1167
 #: addressbook/gui/component/addressbook-factory.c:48
-#: calendar/conduits/calendar/calendar-conduit.c:1204
-#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/conduits/calendar/calendar-conduit.c:1262
+#: calendar/conduits/todo/todo-conduit.c:1034
 #: calendar/gui/alarm-notify/notify-main.c:78 calendar/gui/main.c:63
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo konnte nicht initialisiert werden"
@@ -681,20 +681,20 @@ msgstr "Cursor konnte nicht geladen werden\n"
 msgid "EBook not loaded\n"
 msgstr "EBook nicht geladen\n"
 
-#: addressbook/conduit/address-conduit.c:681
-#: calendar/conduits/calendar/calendar-conduit.c:778
-#: calendar/conduits/todo/todo-conduit.c:592
+#: addressbook/conduit/address-conduit.c:731
+#: calendar/conduits/calendar/calendar-conduit.c:837
+#: calendar/conduits/todo/todo-conduit.c:609
 msgid "Could not start wombat server"
 msgstr "Der Wombat-Server konnte nicht gestartet werden"
 
-#: addressbook/conduit/address-conduit.c:682
-#: calendar/conduits/calendar/calendar-conduit.c:779
-#: calendar/conduits/todo/todo-conduit.c:593
+#: addressbook/conduit/address-conduit.c:732
+#: calendar/conduits/calendar/calendar-conduit.c:838
+#: calendar/conduits/todo/todo-conduit.c:610
 msgid "Could not start wombat"
 msgstr "Wombat konnte nicht gestartet werden"
 
-#: addressbook/conduit/address-conduit.c:714
-#: addressbook/conduit/address-conduit.c:717
+#: addressbook/conduit/address-conduit.c:762
+#: addressbook/conduit/address-conduit.c:765
 msgid "Could not read pilot's Address application block"
 msgstr "Adress-Anwendungsblock des konnte Pilot nicht gelesen werden"
 
@@ -739,8 +739,8 @@ msgid "Factory for the sample Addressbook control"
 msgstr "Factory f�r die beispielhafte Adressbuch-Kontrolle"
 
 #: addressbook/gui/component/addressbook-component.c:66
-#: calendar/gui/dialogs/comp-editor-util.c:281
-#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:173
+#: calendar/gui/dialogs/comp-editor-util.c:289
+#: calendar/gui/dialogs/comp-editor-util.c:345 shell/e-local-storage.c:173
 #: shell/e-shortcuts.c:1062
 msgid "Contacts"
 msgstr "Kontakte"
@@ -757,20 +757,20 @@ msgstr "LDAP-Server:"
 msgid "LDAP server containing contact information"
 msgstr "LDAP-Server mit Kontaktinformationen"
 
-#: addressbook/gui/component/addressbook-component.c:386
+#: addressbook/gui/component/addressbook-component.c:411
 #: ui/evolution-addressbook.xml.h:11
 msgid "New Contact"
 msgstr "Neuer Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:386
+#: addressbook/gui/component/addressbook-component.c:411
 msgid "New _Contact"
 msgstr "Neuer _Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:387
+#: addressbook/gui/component/addressbook-component.c:412
 msgid "New Contact List"
 msgstr "Neu Kontaktliste"
 
-#: addressbook/gui/component/addressbook-component.c:387
+#: addressbook/gui/component/addressbook-component.c:412
 msgid "New Contact _List"
 msgstr "Neue Kontakt_liste"
 
@@ -878,19 +878,19 @@ msgid "_Account name:"
 msgstr "_Accountname:"
 
 #: addressbook/gui/component/addressbook-config.glade.h:22
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: 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:90 my-evolution/my-evolution.glade.h:20
+#: mail/mail-config.glade.h:91 my-evolution/my-evolution.glade.h:20
 msgid "_Add"
 msgstr "Hinzuf�gen"
 
 #: addressbook/gui/component/addressbook-config.glade.h:23
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:95
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:96
 #: ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
 #: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
 msgstr "_Bearbeiten"
@@ -912,30 +912,30 @@ msgstr "_Servername:"
 msgid "Other Contacts"
 msgstr "Kontakte"
 
-#: addressbook/gui/component/addressbook.c:393
+#: addressbook/gui/component/addressbook.c:407
 #, c-format
 msgid "Please enter your email address and password for access to %s"
 msgstr ""
 "Bitte geben Sie Ihre E-Mail-Adresse und Ihr Passwort f�r den Zugriff auf %s "
 "ein"
 
-#: addressbook/gui/component/addressbook.c:401
+#: addressbook/gui/component/addressbook.c:415
 msgid "LDAP Authentication"
 msgstr "LDAP-Legitimation"
 
-#: addressbook/gui/component/addressbook.c:412
+#: addressbook/gui/component/addressbook.c:426
 msgid "Email Address:"
 msgstr "E-Mail-Adresse:"
 
-#: addressbook/gui/component/addressbook.c:425
+#: addressbook/gui/component/addressbook.c:439
 msgid "Password:"
 msgstr "Passwort:"
 
-#: addressbook/gui/component/addressbook.c:488
+#: addressbook/gui/component/addressbook.c:502
 msgid "Unable to open addressbook"
 msgstr "Das Adressbuch kann nicht ge�ffnet werden"
 
-#: addressbook/gui/component/addressbook.c:495
+#: addressbook/gui/component/addressbook.c:509
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -945,7 +945,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:500
+#: addressbook/gui/component/addressbook.c:514
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -958,7 +958,7 @@ msgstr ""
 "nachdem Sie sich von der Adresse unten OpenLDAP besorgt\n"
 "haben.\n"
 
-#: addressbook/gui/component/addressbook.c:508
+#: addressbook/gui/component/addressbook.c:522
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -966,37 +966,37 @@ 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:649
+#: addressbook/gui/component/addressbook.c:663
 #: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "Irgend ein Feld enth�lt"
 
-#: addressbook/gui/component/addressbook.c:650
+#: addressbook/gui/component/addressbook.c:664
 msgid "Name contains"
 msgstr "Name enth�lt"
 
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:665
 msgid "Email contains"
 msgstr "E-Mail enth�lt"
 
-#: addressbook/gui/component/addressbook.c:652
+#: addressbook/gui/component/addressbook.c:666
 #: calendar/gui/cal-search-bar.c:59
 msgid "Category is"
 msgstr "Kategorie ist"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:653 widgets/misc/e-filter-bar.h:97
+#: addressbook/gui/component/addressbook.c:667 widgets/misc/e-filter-bar.h:97
 #: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "Komplex..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:883
+#: addressbook/gui/component/addressbook.c:897
 #: calendar/gui/cal-search-bar.c:412
 msgid "Any Category"
 msgstr "Beliebige Kategorie"
 
-#: addressbook/gui/component/addressbook.c:925
+#: addressbook/gui/component/addressbook.c:939
 msgid "The URI that the Folder Browser will display"
 msgstr "Die URI, die der Suchdienst anzeigen wird"
 
@@ -1010,7 +1010,7 @@ msgid "(none)"
 msgstr "(keine)"
 
 #: addressbook/gui/component/e-address-popup.c:466
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #: addressbook/gui/contact-editor/e-contact-editor.c:1636
 msgid "Primary Email"
 msgstr "Prim�re E-Mail"
@@ -1178,119 +1178,126 @@ msgid "Details"
 msgstr "Details"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#, fuzzy
+msgid "F_ree/Busy URL:"
+msgstr "Verf�gbarkeits-Adresse"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "File A_s:"
 msgstr "Einsortieren _unter:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "General"
 msgstr "Allgemein"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+msgid ""
+"If this person publishes free/busy or other calendar information on the "
+"Internet, enter the address\n"
+"of that information here."
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "New phone type"
 msgstr "Neuer Telefon-Typ"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "No_tes:"
 msgstr "Notizen:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Organi_zation:"
 msgstr "_Organisation:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "Phone Types"
 msgstr "Telefon-Typen"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "Wants to receive _HTML mail"
 msgstr "Will HTML-Mail erhalten"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Address..."
 msgstr "Adresse..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "_Assistant's name:"
 msgstr "Name des Assistenten:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Birthday:"
 msgstr "Geburtstag:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Business"
 msgstr "Gesch�ftlich"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#, fuzzy
-msgid "_Calendar Information:"
-msgstr "Kalender-Information"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 #: calendar/gui/dialogs/event-page.glade.h:12
 #: calendar/gui/dialogs/task-page.glade.h:10
 msgid "_Contacts..."
 msgstr "Kontakte..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:834 filter/filter.glade.h:8
-#: mail/folder-browser.c:1371 mail/mail-config.glade.h:94
+#: mail/folder-browser.c:1406 mail/mail-config.glade.h:95
 #: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "L�schen"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Department:"
 msgstr "Abteilung:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#, fuzzy
-msgid "_Free/Busy Information:"
-msgstr "Verf�gbarkeitsinformationen"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Full Name..."
 msgstr "Voller Name..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Home"
 msgstr "Zu Hause"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Job title:"
 msgstr "Stellenbezeichnung:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Manager's Name:"
 msgstr "Name des Vorgesetzten:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Mobile"
 msgstr "Mobil"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Nickname:"
 msgstr "Spitzname:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Office:"
 msgstr "B�ro:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Profession:"
 msgstr "Beruf:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#, fuzzy
+msgid "_Public Calendar URL:"
+msgstr "Kalender"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Spouse:"
 msgstr "Partner:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_This is the mailing address"
 msgstr "Dies ist die Postadresse"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Web page address:"
 msgstr "Adresse der _Webseite:"
 
@@ -2478,7 +2485,7 @@ msgstr "%d Karten"
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
 #: addressbook/gui/widgets/e-addressbook-view.c:691
 #: addressbook/gui/widgets/e-addressbook-view.c:753
-#: addressbook/gui/widgets/e-addressbook-view.c:1373
+#: addressbook/gui/widgets/e-addressbook-view.c:1422
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Als VCard speichern"
@@ -2532,8 +2539,8 @@ msgid "Success"
 msgstr "Erfolg"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1710
-#: shell/e-storage.c:515
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1702
+#: shell/e-storage.c:520
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
@@ -2541,7 +2548,7 @@ msgstr "Unbekannter Fehler"
 msgid "Repository offline"
 msgstr "Repository offline"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:505
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:510
 msgid "Permission denied"
 msgstr "Erlaubnis verweigert"
 
@@ -2558,10 +2565,10 @@ msgid "Protocol not supported"
 msgstr "Protokoll nicht unterst�tzt"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:733 calendar/gui/calendar-model.c:1274
+#: calendar/gui/calendar-model.c:726 calendar/gui/calendar-model.c:1247
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:544
-#: camel/camel-service.c:580
+#: calendar/gui/e-calendar-table.c:461 camel/camel-service.c:598
+#: camel/camel-service.c:634
 msgid "Cancelled"
 msgstr "Storniert"
 
@@ -2586,7 +2593,7 @@ msgid "Error removing list"
 msgstr "Fehler beim Entfernen einer Liste"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1248
+#: addressbook/gui/widgets/e-addressbook-view.c:1297
 msgid "Error removing card"
 msgstr "Fehler beim Entfernen einer Karte"
 
@@ -2859,8 +2866,8 @@ msgstr "_Schrift..."
 msgid "Print cards"
 msgstr "Karten drucken"
 
-#: addressbook/printing/e-contact-print.c:1112
-#: addressbook/printing/e-contact-print.c:1134
+#: addressbook/printing/e-contact-print.c:1152
+#: addressbook/printing/e-contact-print.c:1174
 msgid "Print card"
 msgstr "Karte drucken"
 
@@ -2869,18 +2876,44 @@ msgstr "Karte drucken"
 msgid "Print envelope"
 msgstr "Umschlag drucken"
 
-#: calendar/conduits/calendar/calendar-conduit.c:735
-#: calendar/conduits/todo/todo-conduit.c:548
+#: calendar/cal-util/cal-util.c:418 calendar/cal-util/cal-util.c:440
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:385 mail/message-list.c:652
+msgid "High"
+msgstr "Hoch"
+
+#: calendar/cal-util/cal-util.c:420 calendar/cal-util/cal-util.c:442
+#: calendar/gui/calendar-model.c:1673
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:386 mail/message-list.c:651
+msgid "Normal"
+msgstr "Normal"
+
+#: calendar/cal-util/cal-util.c:422 calendar/cal-util/cal-util.c:444
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:387 mail/message-list.c:650
+msgid "Low"
+msgstr "Niedrig"
+
+#. An empty string is the same as 'None'.
+#: calendar/cal-util/cal-util.c:438
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:388
+msgid "Undefined"
+msgstr "Undefiniert"
+
+#: calendar/conduits/calendar/calendar-conduit.c:793
+#: calendar/conduits/todo/todo-conduit.c:564
 msgid "Error while communicating with calendar server"
 msgstr "Fehler bei der Kommunikation mit dem Kalender-Server"
 
-#: calendar/conduits/calendar/calendar-conduit.c:839
-#: calendar/conduits/calendar/calendar-conduit.c:842
+#: calendar/conduits/calendar/calendar-conduit.c:896
+#: calendar/conduits/calendar/calendar-conduit.c:899
 msgid "Could not read pilot's Calendar application block"
 msgstr "Calendar-Anwendungsblock des Pilot konnte nicht gelesen werden"
 
-#: calendar/conduits/todo/todo-conduit.c:653
-#: calendar/conduits/todo/todo-conduit.c:656
+#: calendar/conduits/todo/todo-conduit.c:668
+#: calendar/conduits/todo/todo-conduit.c:671
 msgid "Could not read pilot's ToDo application block"
 msgstr "ToDo-Anwendungsblock des Pilot konnte nicht gelesen werden"
 
@@ -2928,45 +2961,45 @@ msgstr "Alarm-Benachrichtigungsdienst"
 msgid "Factory for the alarm notification service"
 msgstr "Factory f�r den Alarm-Benachrichtigungsdienst."
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:152
 #, c-format
 msgid "Notification about your appointment starting on %s and ending on %s"
 msgstr "Hinweis auf Ihren Termin von %s bis %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:156
 #, c-format
 msgid "Notification about your appointment starting on %s"
 msgstr "Hinweis auf Ihren Termin um %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:161
 #, c-format
 msgid "Notification about your appointment ending on %s"
 msgstr "Hinweis auf Ihren um %s endenden Termin"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:165
 msgid "Notification about your appointment"
 msgstr "Hinweis auf Ihren Termin"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:172
 #, c-format
 msgid "Notification about your task starting on %s and ending on %s"
 msgstr "Hinweis auf Ihre Aufgabe von %s bis %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:176
 #, c-format
 msgid "Notification about your task starting on %s"
 msgstr "Hinweis auf Ihre um %s beginnende Aufgabe"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:181
 #, c-format
 msgid "Notification about your task ending on %s"
 msgstr "Hinweis auf Ihre um %s endende Aufgabe"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:185
 msgid "Notification about your task"
 msgstr "Hinweis �ber Ihre Aufgabe"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:267
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "Alarm am %A, %d. %b %Y %H.%M"
 
@@ -3047,7 +3080,7 @@ msgstr "%d. %B %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: calendar/gui/calendar-commands.c:467
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1442
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1446
 msgid "%d %B"
 msgstr "%d. %B"
 
@@ -3058,17 +3091,17 @@ msgstr ""
 "Die Kalender-Ansicht konnte nicht erstellt werden. Bitte �berpr�fen Sie Ihre "
 "ORBit und OAF Einstellungen. "
 
-#: calendar/gui/calendar-model.c:399 calendar/gui/calendar-model.c:1001
-#: calendar/gui/e-calendar-table.c:307
+#: calendar/gui/calendar-model.c:399 calendar/gui/calendar-model.c:994
+#: calendar/gui/e-calendar-table.c:364
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:1003
-#: calendar/gui/e-calendar-table.c:308
+#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:996
+#: calendar/gui/e-calendar-table.c:365
 msgid "Confidential"
 msgstr "Vertraulich"
 
-#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:306
+#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:363
 msgid "Public"
 msgstr "�ffentlich"
 
@@ -3088,67 +3121,48 @@ msgstr "O"
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:538 calendar/gui/calendar-model.c:1183
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:652
-msgid "High"
-msgstr "Hoch"
-
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1185
-#: calendar/gui/calendar-model.c:1700
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:651
-msgid "Normal"
-msgstr "Normal"
-
-#: calendar/gui/calendar-model.c:542 calendar/gui/calendar-model.c:1187
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:650
-msgid "Low"
-msgstr "Niedrig"
-
-#: calendar/gui/calendar-model.c:573 calendar/gui/calendar-model.c:1220
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/calendar-model.c:566 calendar/gui/calendar-model.c:1193
+#: calendar/gui/e-calendar-table.c:437
 msgid "Free"
 msgstr "Frei"
 
-#: calendar/gui/calendar-model.c:575 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/calendar-model.c:568 calendar/gui/e-calendar-table.c:438
 #: calendar/gui/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr "Besch�ftigt"
 
-#: calendar/gui/calendar-model.c:724 calendar/gui/calendar-model.c:1268
+#: calendar/gui/calendar-model.c:717 calendar/gui/calendar-model.c:1241
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:401
+#: calendar/gui/e-calendar-table.c:458
 msgid "Not Started"
 msgstr "Nicht gestartet"
 
-#: calendar/gui/calendar-model.c:727 calendar/gui/calendar-model.c:1270
+#: calendar/gui/calendar-model.c:720 calendar/gui/calendar-model.c:1243
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:402
+#: calendar/gui/e-calendar-table.c:459
 msgid "In Progress"
 msgstr "In Bearbeitung"
 
-#: calendar/gui/calendar-model.c:730 calendar/gui/calendar-model.c:1272
+#: calendar/gui/calendar-model.c:723 calendar/gui/calendar-model.c:1245
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-meeting-model.c:298
+#: calendar/gui/e-calendar-table.c:460 calendar/gui/e-meeting-model.c:298
 #: calendar/gui/e-meeting-model.c:321
 msgid "Completed"
 msgstr "Abgeschlossen"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:915 e-util/e-time-utils.c:163
+#: calendar/gui/calendar-model.c:908 e-util/e-time-utils.c:163
 #: e-util/e-time-utils.c:354
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a, %d. %m %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:918 e-util/e-time-utils.c:158
+#: calendar/gui/calendar-model.c:911 e-util/e-time-utils.c:158
 #: e-util/e-time-utils.c:363
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:923
+#: calendar/gui/calendar-model.c:916
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -3159,7 +3173,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:1087
+#: calendar/gui/calendar-model.c:1080
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3169,48 +3183,36 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1127
+#: calendar/gui/calendar-model.c:1120
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Der Prozentwert muss zwischen 0 und 100 (einschlie�lich) sein"
 
-#: calendar/gui/calendar-model.c:1168
-msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
-msgstr ""
-"Die Priorit�t muss 'Hoch', 'Normal', 'Niedrig' oder 'Undefiniert' sein."
-
-#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1181
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:331
-msgid "Undefined"
-msgstr "Undefiniert"
-
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1266 calendar/gui/dialogs/meeting-page.c:332
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1444
+#: calendar/gui/calendar-model.c:1239 calendar/gui/dialogs/meeting-page.c:332
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1446
 #: mail/mail-accounts.c:143 mail/mail-accounts.c:390
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:50
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:203
-#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
-#: widgets/misc/e-dateedit.c:1428 widgets/misc/e-dateedit.c:1543
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:453
+#: widgets/misc/e-dateedit.c:1453 widgets/misc/e-dateedit.c:1568
 msgid "None"
 msgstr "Keine"
 
-#: calendar/gui/calendar-model.c:1702
+#: calendar/gui/calendar-model.c:1675
 msgid "Recurring"
 msgstr "Wiederkehrend"
 
-#: calendar/gui/calendar-model.c:1704
+#: calendar/gui/calendar-model.c:1677
 msgid "Assigned"
 msgstr "Zugewiesen"
 
-#: calendar/gui/calendar-model.c:1710 calendar/gui/e-meeting-model.c:270
+#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:270
 #: calendar/gui/e-meeting-model.c:280 calendar/gui/e-meeting-model.c:506
 #: calendar/gui/e-meeting-model.c:702
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1710 calendar/gui/e-meeting-model.c:282
+#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:282
 #: calendar/gui/e-meeting-model.c:703
 msgid "No"
 msgstr "Nein"
@@ -3247,40 +3249,40 @@ msgstr "Kommentar enth�lt"
 msgid "Unmatched"
 msgstr "Nicht passend"
 
-#: calendar/gui/component-factory.c:62 my-evolution/my-evolution.glade.h:6
+#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:6
 #: shell/e-local-storage.c:172 shell/e-shortcuts.c:1056
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/gui/component-factory.c:63
+#: calendar/gui/component-factory.c:64
 msgid "Folder containing appointments and events"
 msgstr "Ordner mit Terminen und Ereignissen"
 
-#: calendar/gui/component-factory.c:67 calendar/gui/print.c:1719
-#: my-evolution/e-summary-tasks.c:215 my-evolution/e-summary-tasks.c:231
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1723
+#: my-evolution/e-summary-tasks.c:237 my-evolution/e-summary-tasks.c:253
 #: shell/e-local-storage.c:178 shell/e-shortcuts.c:1059
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Aufgaben"
 
-#: calendar/gui/component-factory.c:68
+#: calendar/gui/component-factory.c:69
 msgid "Folder containing to-do items"
 msgstr "Ordner mit To-Do-Eintr�gen"
 
-#: calendar/gui/component-factory.c:593 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:581 ui/evolution-calendar.xml.h:7
 msgid "Create a new appointment"
 msgstr "Einen neuen Termin anlegen"
 
-#: calendar/gui/component-factory.c:594 calendar/gui/e-day-view.c:3420
+#: calendar/gui/component-factory.c:582 calendar/gui/e-day-view.c:3422
 msgid "New _Appointment"
 msgstr "Neuer _Termin"
 
-#: calendar/gui/component-factory.c:599 ui/evolution-calendar.xml.h:8
+#: calendar/gui/component-factory.c:587 ui/evolution-calendar.xml.h:8
 #: ui/evolution-tasks.xml.h:5
 msgid "Create a new task"
 msgstr "Eine neue Aufgabe anlegen"
 
-#: calendar/gui/component-factory.c:600
+#: calendar/gui/component-factory.c:588
 msgid "New _Task"
 msgstr "Neue _Aufgabe"
 
@@ -3354,95 +3356,120 @@ msgstr "Stunden"
 msgid "minutes"
 msgstr "Minuten"
 
-#: calendar/gui/dialogs/alarm-page.c:303
+#: calendar/gui/dialogs/alarm-page.c:307
 #, c-format
 msgid "%d days"
 msgstr "%d Tage"
 
-#: calendar/gui/dialogs/alarm-page.c:305
+#: calendar/gui/dialogs/alarm-page.c:310
 msgid "1 day"
 msgstr "1 Tag"
 
-#: calendar/gui/dialogs/alarm-page.c:308
+#: calendar/gui/dialogs/alarm-page.c:315
 #, c-format
 msgid "%d weeks"
 msgstr "%d Wochen"
 
-#: calendar/gui/dialogs/alarm-page.c:310
+#: calendar/gui/dialogs/alarm-page.c:318
 msgid "1 week"
 msgstr "1 Woche"
 
-#: calendar/gui/dialogs/alarm-page.c:313
+#: calendar/gui/dialogs/alarm-page.c:323
 #, c-format
 msgid "%d hours"
 msgstr "%d Stunden"
 
-#: calendar/gui/dialogs/alarm-page.c:315
+#: calendar/gui/dialogs/alarm-page.c:326
 msgid "1 hour"
 msgstr "1 Stunde"
 
-#: calendar/gui/dialogs/alarm-page.c:318
+#: calendar/gui/dialogs/alarm-page.c:331
 #, c-format
 msgid "%d minutes"
 msgstr "%d Minuten"
 
-#: calendar/gui/dialogs/alarm-page.c:320
+#: calendar/gui/dialogs/alarm-page.c:334
 msgid "1 minute"
 msgstr "1 Minute"
 
-#: calendar/gui/dialogs/alarm-page.c:323
+#: calendar/gui/dialogs/alarm-page.c:339
 #, c-format
 msgid "%d seconds"
 msgstr "%d Sekunden"
 
-#: calendar/gui/dialogs/alarm-page.c:325
+#: calendar/gui/dialogs/alarm-page.c:342
 msgid "1 second"
 msgstr "1 Sekunde"
 
-#: calendar/gui/dialogs/alarm-page.c:350
+#: calendar/gui/dialogs/alarm-page.c:373
 #: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "Einen Klang abspielen"
 
-#: calendar/gui/dialogs/alarm-page.c:354
+#: calendar/gui/dialogs/alarm-page.c:377
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 msgid "Display a message"
 msgstr "Eine Nachricht anzeigen"
 
-#: calendar/gui/dialogs/alarm-page.c:358
+#: calendar/gui/dialogs/alarm-page.c:381
 msgid "Send an email"
 msgstr "Eine E-Mail verschicken"
 
-#: calendar/gui/dialogs/alarm-page.c:362
+#: calendar/gui/dialogs/alarm-page.c:385
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "Ein Programm ausf�hren"
 
-#: calendar/gui/dialogs/alarm-page.c:368 calendar/gui/dialogs/alarm-page.c:404
-#: calendar/gui/e-meeting-model.c:226 calendar/gui/e-meeting-model.c:261
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:674
-#: calendar/gui/e-meeting-model.c:690
-#: camel/providers/smtp/camel-smtp-transport.c:224
-#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
-msgid "Unknown"
-msgstr "Unbekannt"
+#: calendar/gui/dialogs/alarm-page.c:391
+#, fuzzy
+msgid "Unknown action to be performed"
+msgstr "Unbekanntes Gewitter"
 
-#: calendar/gui/dialogs/alarm-page.c:380
-msgid "before start of appointment"
+#: calendar/gui/dialogs/alarm-page.c:403
+#, fuzzy, c-format
+msgid "%s %s before the start of the appointment"
+msgstr "vor Terminbeginn"
+
+#: calendar/gui/dialogs/alarm-page.c:406
+#, fuzzy, c-format
+msgid "%s %s after the start of the appointment"
 msgstr "vor Terminbeginn"
 
-#: calendar/gui/dialogs/alarm-page.c:383
-msgid "after start of appointment"
-msgstr "nach Terminbeginn"
+#: calendar/gui/dialogs/alarm-page.c:411
+#, fuzzy, c-format
+msgid "%s at the start of the appointment"
+msgstr "vor Terminbeginn"
 
-#: calendar/gui/dialogs/alarm-page.c:393
-msgid "before end of appointment"
-msgstr "vor Terminende"
+#: calendar/gui/dialogs/alarm-page.c:420
+#, fuzzy, c-format
+msgid "%s %s before the end of the appointment"
+msgstr "vor Terminbeginn"
 
-#: calendar/gui/dialogs/alarm-page.c:396
-msgid "after end of appointment"
+#: calendar/gui/dialogs/alarm-page.c:423
+#, fuzzy, c-format
+msgid "%s %s after the end of the appointment"
 msgstr "nach Terminende"
 
+#: calendar/gui/dialogs/alarm-page.c:428
+#, fuzzy, c-format
+msgid "%s at the end of the appointment"
+msgstr "nach Terminende"
+
+#: calendar/gui/dialogs/alarm-page.c:439
+#, fuzzy, c-format
+msgid "%s at an unknown time"
+msgstr "ein unbekannter Absender"
+
+#: calendar/gui/dialogs/alarm-page.c:445
+#, fuzzy, c-format
+msgid "%s at %s"
+msgstr "%s-Server %s"
+
+#: calendar/gui/dialogs/alarm-page.c:452
+#, c-format
+msgid "%s for an unknown trigger type"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3766,55 +3793,55 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Sie haben keine �nderungen gemacht, den Editor aktualisieren?"
 
-#: calendar/gui/dialogs/comp-editor-util.c:159 calendar/gui/print.c:2128
+#: calendar/gui/dialogs/comp-editor-util.c:167 calendar/gui/print.c:2132
 msgid " to "
 msgstr " an "
 
-#: calendar/gui/dialogs/comp-editor-util.c:163 calendar/gui/print.c:2132
+#: calendar/gui/dialogs/comp-editor-util.c:171 calendar/gui/print.c:2136
 msgid " (Completed "
 msgstr " (Abgeschlossen "
 
-#: calendar/gui/dialogs/comp-editor-util.c:165 calendar/gui/print.c:2134
+#: calendar/gui/dialogs/comp-editor-util.c:173 calendar/gui/print.c:2138
 msgid "Completed "
 msgstr "Abgeschlossen "
 
-#: calendar/gui/dialogs/comp-editor-util.c:170 calendar/gui/print.c:2139
+#: calendar/gui/dialogs/comp-editor-util.c:178 calendar/gui/print.c:2143
 msgid " (Due "
 msgstr " (F�llig am "
 
-#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2141
+#: calendar/gui/dialogs/comp-editor-util.c:180 calendar/gui/print.c:2145
 msgid "Due "
 msgstr "F�llig am "
 
-#: calendar/gui/dialogs/comp-editor.c:515
+#: calendar/gui/dialogs/comp-editor.c:521
 msgid "Edit Appointment"
 msgstr "Termin bearbeiten"
 
-#: calendar/gui/dialogs/comp-editor.c:520
+#: calendar/gui/dialogs/comp-editor.c:526
 #, c-format
 msgid "Appointment - %s"
 msgstr "Termin - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:523
+#: calendar/gui/dialogs/comp-editor.c:529
 #, c-format
 msgid "Task - %s"
 msgstr "Aufgabe - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:526
+#: calendar/gui/dialogs/comp-editor.c:532
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journaleintrag - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:540
+#: calendar/gui/dialogs/comp-editor.c:546
 msgid "No summary"
 msgstr "Keine Zusammenfassung"
 
-#: calendar/gui/dialogs/comp-editor.c:950 mail/mail-callbacks.c:1662
+#: calendar/gui/dialogs/comp-editor.c:952 mail/mail-callbacks.c:1671
 #: mail/mail-display.c:100
 msgid "Overwrite file?"
 msgstr "Datei �berschreiben?"
 
-#: calendar/gui/dialogs/comp-editor.c:954 mail/mail-callbacks.c:1668
+#: calendar/gui/dialogs/comp-editor.c:956 mail/mail-callbacks.c:1677
 #: mail/mail-display.c:104
 msgid ""
 "A file by that name already exists.\n"
@@ -3823,54 +3850,54 @@ msgstr ""
 "Eine Datei mit diesem Namen existiert bereits.\n"
 "�berschreiben?"
 
-#: calendar/gui/dialogs/comp-editor.c:1017 ui/evolution-comp-editor.xml.h:13
+#: calendar/gui/dialogs/comp-editor.c:1019 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "Speichern unter..."
 
-#: calendar/gui/dialogs/comp-editor.c:1170
+#: calendar/gui/dialogs/comp-editor.c:1172
 msgid "Unable to obtain current version!"
 msgstr "Aktuelle Version kann nicht erhalten werden!"
 
-#: calendar/gui/dialogs/delete-comp.c:90
+#: calendar/gui/dialogs/delete-comp.c:91
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Sind Sie sicher, dass Sie den Termin \"%s\" l�schen wollen?"
 
-#: calendar/gui/dialogs/delete-comp.c:93
+#: calendar/gui/dialogs/delete-comp.c:94
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Sind Sie sicher, dass Sie diesen unbenannten Termin l�schen wollen?"
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:100
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Sind Sie sicher, dass Sie die Aufgabe `%s' l�schen wollen?"
 
-#: calendar/gui/dialogs/delete-comp.c:102
+#: calendar/gui/dialogs/delete-comp.c:103
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Sind Sie sicher, dass Sie diese unbenannte Aufgabe l�schen wollen?"
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:109
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Sind Sie sicher, dass Sie den Journaleintrag `%s' l�schen wollen?"
 
-#: calendar/gui/dialogs/delete-comp.c:111
+#: calendar/gui/dialogs/delete-comp.c:112
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 "Sind Sie sicher, dass Sie diesen unbenannten Journaleintrag l�schen wollen?"
 
-#: calendar/gui/dialogs/delete-comp.c:126
+#: calendar/gui/dialogs/delete-comp.c:127
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Sind Sie sicher, dass Sie %d Termine l�schen wollen?"
 
-#: calendar/gui/dialogs/delete-comp.c:131
+#: calendar/gui/dialogs/delete-comp.c:132
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Sind Sie sicher, dass Sie %d Aufgaben l�schen wollen?"
 
-#: calendar/gui/dialogs/delete-comp.c:136
+#: calendar/gui/dialogs/delete-comp.c:137
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Sind Sie sicher, dass Sie %d Journaleintr�ge l�schen wollen?"
@@ -4053,7 +4080,7 @@ msgstr "Status"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:18
-#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:85
+#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:86
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Typ"
@@ -4075,8 +4102,8 @@ msgstr "Andere _einladen"
 msgid "_Other Organizer"
 msgstr "_Anderer Organisator"
 
-#: calendar/gui/dialogs/recurrence-page.c:422 calendar/gui/print.c:1851
-#: calendar/gui/print.c:1853 calendar/gui/print.c:1854
+#: calendar/gui/dialogs/recurrence-page.c:422 calendar/gui/print.c:1855
+#: calendar/gui/print.c:1857 calendar/gui/print.c:1858
 msgid "%a %b %d %Y"
 msgstr "%a, %d. %b %Y"
 
@@ -4202,7 +4229,7 @@ msgid "Progress"
 msgstr "Fortschritt"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:910
+#: my-evolution/e-summary-preferences.c:949
 msgid "URL:"
 msgstr "URL:"
 
@@ -4221,7 +4248,7 @@ msgstr "Arbeitsauftrag"
 
 #: calendar/gui/dialogs/task-page.glade.h:4
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:28
 msgid "Description:"
 msgstr "Beschreibung:"
 
@@ -4237,105 +4264,105 @@ msgstr "Vertraulich"
 msgid "_Due Date:"
 msgstr "F�llig am:"
 
-#: calendar/gui/e-calendar-table.c:350
+#: calendar/gui/e-calendar-table.c:407
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:351
+#: calendar/gui/e-calendar-table.c:408
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:409
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:410
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:411
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:412
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:356
+#: calendar/gui/e-calendar-table.c:413
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:357
+#: calendar/gui/e-calendar-table.c:414
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:358
+#: calendar/gui/e-calendar-table.c:415
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:359
+#: calendar/gui/e-calendar-table.c:416
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:360
+#: calendar/gui/e-calendar-table.c:417
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3441
-#: calendar/gui/e-week-view.c:3288 mail/folder-browser.c:1336
+#: calendar/gui/e-calendar-table.c:914 calendar/gui/e-day-view.c:3443
+#: calendar/gui/e-week-view.c:3296 mail/folder-browser.c:1371
 #: shell/e-shortcuts-view.c:385
 msgid "_Open"
 msgstr "�_ffnen"
 
-#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3450
-#: calendar/gui/e-week-view.c:3297 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:918 calendar/gui/e-day-view.c:3452
+#: calendar/gui/e-week-view.c:3305 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:856 calendar/gui/e-day-view.c:3452
-#: calendar/gui/e-week-view.c:3299 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:920 calendar/gui/e-day-view.c:3454
+#: calendar/gui/e-week-view.c:3307 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:14
 msgid "_Copy"
 msgstr "Kopieren"
 
-#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3427
-#: calendar/gui/e-day-view.c:3454 calendar/gui/e-week-view.c:3275
-#: calendar/gui/e-week-view.c:3301 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:922 calendar/gui/e-day-view.c:3429
+#: calendar/gui/e-day-view.c:3456 calendar/gui/e-week-view.c:3283
+#: calendar/gui/e-week-view.c:3309 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:40 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:17
 msgid "_Paste"
 msgstr "Einf�gen"
 
-#: calendar/gui/e-calendar-table.c:863
+#: calendar/gui/e-calendar-table.c:927
 msgid "_Mark as Complete"
 msgstr "Als abgeschlossen _markieren"
 
-#: calendar/gui/e-calendar-table.c:865
+#: calendar/gui/e-calendar-table.c:929
 msgid "_Delete this Task"
 msgstr "Diese Aufgabe _l�schen"
 
-#: calendar/gui/e-calendar-table.c:868
+#: calendar/gui/e-calendar-table.c:932
 msgid "_Mark Tasks as Complete"
 msgstr "Aufgaen als abgeschlossen _markieren"
 
-#: calendar/gui/e-calendar-table.c:870
+#: calendar/gui/e-calendar-table.c:934
 msgid "_Delete Selected Tasks"
 msgstr "Ausgew�hlte Aufgaben _l�schen"
 
-#: calendar/gui/e-calendar-table.c:1130
+#: calendar/gui/e-calendar-table.c:1194
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Klicken, um eine Aufgabe hinzuzuf�gen"
@@ -4344,8 +4371,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:702
-#: camel/camel-filter-driver.c:819
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:718
+#: camel/camel-filter-driver.c:834
 msgid "Complete"
 msgstr "Abgeschlossen"
 
@@ -4376,8 +4403,8 @@ 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:30 shell/e-shortcuts.c:1050
-#: shell/e-storage-set-view.c:1424 shell/e-summary-storage.c:80
+#: my-evolution/component-factory.c:45 shell/e-shortcuts.c:1050
+#: shell/e-storage-set-view.c:1420 shell/e-summary-storage.c:80
 msgid "Summary"
 msgstr "Zusammenfassung"
 
@@ -4397,7 +4424,7 @@ 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:285 calendar/gui/e-day-view.c:1374
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1458
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
 msgid "%A %d %B"
 msgstr "%A, %d. %B"
 
@@ -4409,276 +4436,293 @@ 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:608 calendar/gui/e-week-view.c:344
-#: calendar/gui/print.c:765
+#: calendar/gui/e-day-view.c:608 calendar/gui/e-week-view.c:345
+#: calendar/gui/print.c:769
 msgid "am"
 msgstr "AM"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:347
-#: calendar/gui/print.c:767
+#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:348
+#: calendar/gui/print.c:771
 msgid "pm"
 msgstr "PM"
 
-#: calendar/gui/e-day-view.c:3422 calendar/gui/e-week-view.c:3270
+#: calendar/gui/e-day-view.c:3424 calendar/gui/e-week-view.c:3278
 msgid "New All Day _Event"
 msgstr "Neues ganzt�giges _Ereignis"
 
-#: calendar/gui/e-day-view.c:3432 calendar/gui/e-week-view.c:3280
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3288
 #: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "Zum _heutigen Tag"
 
-#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3282
+#: calendar/gui/e-day-view.c:3436 calendar/gui/e-week-view.c:3290
 msgid "_Go to Date..."
 msgstr "_Gehe zu Datum..."
 
-#: calendar/gui/e-day-view.c:3443 calendar/gui/e-week-view.c:3290
+#: calendar/gui/e-day-view.c:3445 calendar/gui/e-week-view.c:3298
 msgid "_Delete this Appointment"
 msgstr "Diesen Termin _l�schen"
 
-#: calendar/gui/e-day-view.c:3462 calendar/gui/e-week-view.c:3315
+#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3323
 msgid "Make this Occurrence _Movable"
 msgstr "Dieses Auftreten _beweglich machen"
 
-#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3317
+#: calendar/gui/e-day-view.c:3466 calendar/gui/e-week-view.c:3325
 msgid "Delete this _Occurrence"
 msgstr "Dieses _Auftreten l�schen"
 
-#: calendar/gui/e-day-view.c:3466 calendar/gui/e-week-view.c:3319
+#: calendar/gui/e-day-view.c:3468 calendar/gui/e-week-view.c:3327
 msgid "Delete _All Occurrences"
 msgstr "Jedes _Auftreten l�schen"
 
+#: calendar/gui/e-itip-control.c:469
+msgid "Meeting begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:474
+msgid "Task begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:479
+#, fuzzy
+msgid "Free/Busy info begins: <b>"
+msgstr "Verf�gbarkeitsinformationen"
+
+#: calendar/gui/e-itip-control.c:483
+msgid "Begins: <b>"
+msgstr ""
+
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:677
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:664
+#: calendar/gui/e-itip-control.c:692
 #, c-format
 msgid "<b>Summary:</b> %s<br><br>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:664
+#: calendar/gui/e-itip-control.c:692
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:674
+#: calendar/gui/e-itip-control.c:702
 #, fuzzy, c-format
 msgid "<b>Description:</b> %s"
 msgstr "Beschreibung:"
 
-#: calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:737
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> hat Besprechungsinformationen ver�ffentlicht."
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:738
 msgid "Meeting Information"
 msgstr "Besprechungsinformationen"
 
-#: calendar/gui/e-itip-control.c:715
+#: calendar/gui/e-itip-control.c:742
 #, 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:716
+#: calendar/gui/e-itip-control.c:743
 msgid "Meeting Proposal"
 msgstr "Besprechungsvorschlag"
 
-#: calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-itip-control.c:747
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> w�nscht, etwas zu einer geplanten Besprechung hinzuzuf�gen."
 
-#: calendar/gui/e-itip-control.c:721
+#: calendar/gui/e-itip-control.c:748
 msgid "Meeting Update"
 msgstr "Aktualisierung der Besprechung"
 
-#: calendar/gui/e-itip-control.c:725
+#: calendar/gui/e-itip-control.c:752
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> m�chte die letzten Besprechungsinformationen erhalten."
 
-#: calendar/gui/e-itip-control.c:726
+#: calendar/gui/e-itip-control.c:753
 msgid "Meeting Update Request"
 msgstr "Besprechungs-Aktualisierungsanfrage"
 
-#: calendar/gui/e-itip-control.c:730
+#: calendar/gui/e-itip-control.c:757
 #, 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:731
+#: calendar/gui/e-itip-control.c:758
 msgid "Meeting Reply"
 msgstr "Besprechungsantwort"
 
-#: calendar/gui/e-itip-control.c:735
+#: calendar/gui/e-itip-control.c:762
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> hat eine Besprechung abgesagt."
 
-#: calendar/gui/e-itip-control.c:736
+#: calendar/gui/e-itip-control.c:763
 msgid "Meeting Cancellation"
 msgstr "Besprechungsstornierung"
 
-#: calendar/gui/e-itip-control.c:740 calendar/gui/e-itip-control.c:788
-#: calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:767 calendar/gui/e-itip-control.c:815
+#: calendar/gui/e-itip-control.c:848
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> hat eine unverst�ndliche Nachricht geschickt."
 
-#: calendar/gui/e-itip-control.c:741
+#: calendar/gui/e-itip-control.c:768
 msgid "Bad Meeting Message"
 msgstr "Meldung einer ung�ltigen Besprechung"
 
-#: calendar/gui/e-itip-control.c:758
+#: calendar/gui/e-itip-control.c:785
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> hat Aufgabeninformationen ver�ffentlicht."
 
-#: calendar/gui/e-itip-control.c:759
+#: calendar/gui/e-itip-control.c:786
 msgid "Task Information"
 msgstr "Aufgaben-Informationen"
 
-#: calendar/gui/e-itip-control.c:763
+#: calendar/gui/e-itip-control.c:790
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> w�nscht, dass Sie eine Aufgabe erledigen."
 
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:791
 msgid "Task Proposal"
 msgstr "Aufgabenvorschlag"
 
-#: calendar/gui/e-itip-control.c:768
+#: calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> m�chte etwas zu einer geplanten Aufgabe hinzuf�gen."
 
-#: calendar/gui/e-itip-control.c:769
+#: calendar/gui/e-itip-control.c:796
 msgid "Task Update"
 msgstr "Aktualisierung einer Aufgabe"
 
-#: calendar/gui/e-itip-control.c:773
+#: calendar/gui/e-itip-control.c:800
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> m�chte die neuesten Aufgabeninformationen erhalten."
 
-#: calendar/gui/e-itip-control.c:774
+#: calendar/gui/e-itip-control.c:801
 msgid "Task Update Request"
 msgstr "Aufgaben-Aktualisierungsanfrage"
 
-#: calendar/gui/e-itip-control.c:778
+#: calendar/gui/e-itip-control.c:805
 #, 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:779
+#: calendar/gui/e-itip-control.c:806
 msgid "Task Reply"
 msgstr "Aufgabenantwort"
 
-#: calendar/gui/e-itip-control.c:783
+#: calendar/gui/e-itip-control.c:810
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> hat eine Aufgabe storniert."
 
-#: calendar/gui/e-itip-control.c:784
+#: calendar/gui/e-itip-control.c:811
 msgid "Task Cancellation"
 msgstr "Aufgabenstornierung"
 
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:816
 msgid "Bad Task Message"
 msgstr "Meldung einer ung�ltigen Aufgabe"
 
-#: calendar/gui/e-itip-control.c:806
+#: calendar/gui/e-itip-control.c:833
 #, 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:807
+#: calendar/gui/e-itip-control.c:834
 msgid "Free/Busy Information"
 msgstr "Verf�gbarkeitsinformationen"
 
-#: calendar/gui/e-itip-control.c:811
+#: calendar/gui/e-itip-control.c:838
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> fragt um Ihre Verf�gbarkeitsinformationen an."
 
-#: calendar/gui/e-itip-control.c:812
+#: calendar/gui/e-itip-control.c:839
 msgid "Free/Busy Request"
 msgstr "Verf�gbarkeitsanfrage"
 
-#: calendar/gui/e-itip-control.c:816
+#: calendar/gui/e-itip-control.c:843
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> hat auf eine Verf�gbarkeitsanfrage geantwortet."
 
-#: calendar/gui/e-itip-control.c:817
+#: calendar/gui/e-itip-control.c:844
 msgid "Free/Busy Reply"
 msgstr "Verf�gbarkeitsantwort"
 
-#: calendar/gui/e-itip-control.c:822
+#: calendar/gui/e-itip-control.c:849
 msgid "Bad Free/Busy Message"
 msgstr "Ung�ltige Verf�gbarkeitsnachricht"
 
-#: calendar/gui/e-itip-control.c:889
+#: calendar/gui/e-itip-control.c:916
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "Dieser Ordner scheint nicht-wiederherstellbar korrupt zu sein."
 
-#: calendar/gui/e-itip-control.c:908
+#: calendar/gui/e-itip-control.c:935
 #, fuzzy
 msgid "The message contains only unsupported requests."
 msgstr "Diese Nachricht enth�lt ausschlie�lich BCC-Empf�nger."
 
-#: calendar/gui/e-itip-control.c:936 calendar/gui/e-itip-control.c:942
+#: calendar/gui/e-itip-control.c:963 calendar/gui/e-itip-control.c:969
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1088
 #, fuzzy
 msgid "Calendar file could not be updated!\n"
 msgstr "Der Eintrag konnte nicht verschickt werden!\n"
 
-#: calendar/gui/e-itip-control.c:1063
+#: calendar/gui/e-itip-control.c:1090
 msgid "Update complete\n"
 msgstr "Aktualisierung abgeschlossen\n"
 
-#: calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.c:1134
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1142
 msgid "Attendee status ould not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1144
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1119
+#: calendar/gui/e-itip-control.c:1146
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1174
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "Der Eintrag konnte nicht aus Ihrer Kalenderdatei entfernt werden!\n"
 
-#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-itip-control.c:1176
 msgid "Removal Complete"
 msgstr "Entfernen abgeschlossen"
 
-#: calendar/gui/e-itip-control.c:1181 calendar/gui/e-itip-control.c:1216
+#: calendar/gui/e-itip-control.c:1208 calendar/gui/e-itip-control.c:1242
 msgid "Item sent!\n"
 msgstr "Eintrag verschickt!\n"
 
-#: calendar/gui/e-itip-control.c:1183 calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1210 calendar/gui/e-itip-control.c:1246
 msgid "The item could not be sent!\n"
 msgstr "Der Eintrag konnte nicht verschickt werden!\n"
 
-#: calendar/gui/e-itip-control.c:1380
+#: calendar/gui/e-itip-control.c:1406
 msgid "Unable to find any of your identities in the attendees list!\n"
 msgstr ""
 
@@ -4739,6 +4783,14 @@ msgstr "Ressource"
 msgid "Room"
 msgstr "Raum"
 
+#: calendar/gui/e-meeting-model.c:226 calendar/gui/e-meeting-model.c:261
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:674
+#: calendar/gui/e-meeting-model.c:690
+#: camel/providers/smtp/camel-smtp-transport.c:224
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
+msgid "Unknown"
+msgstr "Unbekannt"
+
 #: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
 #: calendar/gui/e-meeting-model.c:686
 msgid "Chair"
@@ -4791,14 +4843,14 @@ msgstr "In Bearbeitung"
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:472
-#: calendar/gui/e-meeting-time-sel.c:1936
+#: calendar/gui/e-meeting-time-sel.c:1937
 msgid "%A, %B %d, %Y"
 msgstr "%a, %d. %B %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:476
-#: calendar/gui/e-meeting-time-sel.c:1964 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:1965 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:345
 msgid "%a %m/%d/%Y"
 msgstr "%a, %d.%m.%Y"
@@ -4806,7 +4858,7 @@ msgstr "%a, %d.%m.%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:480 e-util/e-time-utils.c:221
-#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1552
+#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1577
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
@@ -4885,16 +4937,16 @@ 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-week-view.c:3268 calendar/gui/e-week-view.c:3306
+#: calendar/gui/e-week-view.c:3276 calendar/gui/e-week-view.c:3314
 msgid "New _Appointment..."
 msgstr "Neuer _Termin..."
 
-#: calendar/gui/gnome-cal.c:1318
+#: calendar/gui/gnome-cal.c:1319
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Der Ordner in `%s' konnte nicht ge�ffnet werden"
 
-#: calendar/gui/gnome-cal.c:1329
+#: calendar/gui/gnome-cal.c:1330
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
@@ -4964,201 +5016,201 @@ msgstr "Ein Organisator muss feststehen."
 msgid "Could not create the component editor factory"
 msgstr "Komponenteneditor-Fabrik konnte nicht angelegt werden"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:432
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "Su"
 msgstr "So"
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "Mo"
 msgstr "Mo"
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "Tu"
 msgstr "Di"
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "We"
 msgstr "Mi"
 
-#: calendar/gui/print.c:497
+#: calendar/gui/print.c:500
 msgid "Th"
 msgstr "Do"
 
-#: calendar/gui/print.c:497
+#: calendar/gui/print.c:500
 msgid "Fr"
 msgstr "Fr"
 
-#: calendar/gui/print.c:497
+#: calendar/gui/print.c:500
 msgid "Sa"
 msgstr "Sa"
 
 #. Day
-#: calendar/gui/print.c:1827
+#: calendar/gui/print.c:1831
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Angew�hlter Tag (%a, %d. %b %Y)"
 
-#: calendar/gui/print.c:1846 calendar/gui/print.c:1850
+#: calendar/gui/print.c:1850 calendar/gui/print.c:1854
 msgid "%a %b %d"
 msgstr "%a, %d. %b"
 
-#: calendar/gui/print.c:1847
+#: calendar/gui/print.c:1851
 msgid "%a %d %Y"
 msgstr "%a, %d. %Y"
 
-#: calendar/gui/print.c:1858
+#: calendar/gui/print.c:1862
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Angew�hlte Woche (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1866
+#: calendar/gui/print.c:1870
 msgid "Selected month (%b %Y)"
 msgstr "Angew�hlter Monat (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1873
+#: calendar/gui/print.c:1877
 msgid "Selected year (%Y)"
 msgstr "Angew�hltes Jahr (%Y)"
 
-#: calendar/gui/print.c:2214
+#: calendar/gui/print.c:2221
 msgid "Print Calendar"
 msgstr "Kalender drucken"
 
-#: calendar/gui/print.c:2302 calendar/gui/print.c:2394
-#: mail/mail-callbacks.c:2071 my-evolution/e-summary.c:551
+#: calendar/gui/print.c:2312 calendar/gui/print.c:2404
+#: mail/mail-callbacks.c:2080 my-evolution/e-summary.c:607
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
 msgstr "Druckvorschau"
 
-#: calendar/gui/print.c:2331
+#: calendar/gui/print.c:2341
 msgid "Print Item"
 msgstr "Eintrag drucken"
 
-#: calendar/gui/print.c:2412
+#: calendar/gui/print.c:2422
 msgid "Print Setup"
 msgstr "Druckeinstellungen"
 
@@ -5366,65 +5418,82 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr "Resynchronisieren mit dem Server"
 
-#: camel/camel-disco-store.c:305
+#: camel/camel-disco-store.c:336
 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:533 camel/camel-filter-driver.c:542
+#: camel/camel-filter-driver.c:549 camel/camel-filter-driver.c:558
 msgid "Syncing folders"
 msgstr "Ordner werden synchronisiert"
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:659
 msgid "Unable to open spool folder"
 msgstr "Der Spool-Ordner kann nicht ge�ffnet werden"
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:668
 msgid "Unable to process spool folder"
 msgstr "Der Spool-Ordner kann nicht verarbeitet werden"
 
-#: camel/camel-filter-driver.c:667
+#: camel/camel-filter-driver.c:683
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Nachricht %d wird abgerufen (%d%%)"
 
-#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
+#: camel/camel-filter-driver.c:687 camel/camel-filter-driver.c:700
 #, c-format
 msgid "Failed on message %d"
 msgstr "Fehlgeschlagen bei Nachricht %d"
 
-#: camel/camel-filter-driver.c:672
+#: camel/camel-filter-driver.c:688
 msgid "Cannot open message"
 msgstr "Nachricht kann nicht ge�ffnet werden"
 
-#: camel/camel-filter-driver.c:698 camel/camel-filter-driver.c:814
+#: camel/camel-filter-driver.c:714 camel/camel-filter-driver.c:829
 msgid "Syncing folder"
 msgstr "Ordner wird synchronisiert"
 
-#: camel/camel-filter-driver.c:770
+#: camel/camel-filter-driver.c:786
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Nachricht %d von %d wird abgerufen"
 
-#: camel/camel-filter-driver.c:775 camel/camel-filter-driver.c:793
+#: camel/camel-filter-driver.c:791 camel/camel-filter-driver.c:809
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Fehlgeschlagen bei Nachricht %d von %d"
 
-#: camel/camel-filter-driver.c:900
+#: camel/camel-filter-driver.c:918
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Fehler beim Verarbeiten des Filters: %s: %s"
 
-#: camel/camel-filter-driver.c:906
+#: camel/camel-filter-driver.c:924
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Fehler beim Ausf�hren des Filters: %s: %s"
 
-#: camel/camel-filter-search.c:479 camel/camel-filter-search.c:486
+#: camel/camel-filter-search.c:494 camel/camel-filter-search.c:501
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Fehler beim Ausf�hren einer Filtersuche: %s: %s"
 
+#: camel/camel-folder.c:472
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1039
+#, fuzzy, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr ""
+"Fehler beim Ausf�hren eines Suchausdrucks: %s:\n"
+"%s"
+
+#: camel/camel-folder.c:1219
+#, fuzzy
+msgid "Moving messages"
+msgstr "Machrichten werden nach %s verschoben"
+
 #: camel/camel-folder-search.c:333
 #, c-format
 msgid ""
@@ -5452,7 +5521,7 @@ msgstr "(match-all) verlangt einen einzelnen Wahrheitswert als Ergebnis"
 msgid "Performing query on unknown header: %s"
 msgstr "Abfrage wird auf unbekannte Kopfzeile ausgef�hrt: %s"
 
-#: camel/camel-folder-search.c:747 camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:748 camel/camel-folder-search.c:792
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Ung�ltiger Typ in body-contains, Zeichenkette wurde erwartet"
 
@@ -5553,83 +5622,83 @@ 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-pgp-context.c:193
+#: camel/camel-pgp-context.c:191
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Bitte geben Sie Ihre %s-Passphrase f�r %s ein."
 
-#: camel/camel-pgp-context.c:196
+#: camel/camel-pgp-context.c:194
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "Bitte geben Sie Ihre %s-Passphrase ein."
 
-#: camel/camel-pgp-context.c:518
+#: camel/camel-pgp-context.c:525
 #, fuzzy
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr "Nachricht konnte nicht verschickt werden: Keine Empf�nger angegeben."
 
-#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:532 camel/camel-pgp-context.c:706
 #, fuzzy
 msgid "Cannot sign this message: no password provided"
 msgstr ""
 "Nachricht konnte nicht verschickt werden: Absenderadresse nicht g�ltig."
 
-#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:538 camel/camel-pgp-context.c:712
 #, fuzzy, c-format
 msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "Pipe zu GPG/PGP konnte nicht angelegt werden: %s"
 
-#: camel/camel-pgp-context.c:693
+#: camel/camel-pgp-context.c:699
 #, fuzzy
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr "Nachricht konnte nicht verschickt werden: Keine Empf�nger angegeben."
 
-#: camel/camel-pgp-context.c:886
+#: camel/camel-pgp-context.c:891
 #, fuzzy
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr "Nachricht konnte nicht verschickt werden: Keine Empf�nger angegeben."
 
-#: camel/camel-pgp-context.c:892
+#: camel/camel-pgp-context.c:897
 #, fuzzy, c-format
 msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "Pipe zu GPG/PGP konnte nicht angelegt werden: %s"
 
-#: camel/camel-pgp-context.c:903
+#: camel/camel-pgp-context.c:908
 #, fuzzy, c-format
 msgid "Cannot verify this message: couldn't create temp file: %s"
 msgstr "Tempor�re Datei konnte nicht angelegt werden: %s"
 
-#: camel/camel-pgp-context.c:1069
+#: camel/camel-pgp-context.c:1076
 #, fuzzy
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr "Nachricht konnte nicht verschickt werden: Keine Empf�nger angegeben."
 
-#: camel/camel-pgp-context.c:1079
+#: camel/camel-pgp-context.c:1086
 #, fuzzy
 msgid "Cannot encrypt this message: no password provided"
 msgstr ""
 "Nachricht konnte nicht verschickt werden: Absenderadresse nicht g�ltig."
 
-#: camel/camel-pgp-context.c:1086
+#: camel/camel-pgp-context.c:1093
 #, fuzzy, c-format
 msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "Pipe zu GPG/PGP konnte nicht angelegt werden: %s"
 
-#: camel/camel-pgp-context.c:1095
+#: camel/camel-pgp-context.c:1102
 #, fuzzy
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr "Nachricht konnte nicht verschickt werden: Keine Empf�nger angegeben."
 
-#: camel/camel-pgp-context.c:1258
+#: camel/camel-pgp-context.c:1264
 #, fuzzy
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr "Nachricht konnte nicht verschickt werden: Keine Empf�nger angegeben."
 
-#: camel/camel-pgp-context.c:1266
+#: camel/camel-pgp-context.c:1272
 msgid "Cannot decrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1273
+#: camel/camel-pgp-context.c:1279
 #, fuzzy, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "Pipe zu GPG/PGP konnte nicht angelegt werden: %s"
@@ -5675,13 +5744,13 @@ msgstr "Verbindung zu %s (Port %d) konnte nicht hergestellt werden: %s"
 msgid "(unknown host)"
 msgstr "(unbekannter Rechner)"
 
-#: camel/camel-remote-store.c:361 camel/camel-remote-store.c:423
-#: camel/camel-remote-store.c:486
+#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
+#: camel/camel-remote-store.c:483
 #: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "Vorgang abgebrochen"
 
-#: camel/camel-remote-store.c:489
+#: camel/camel-remote-store.c:486
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Verbindung zum Server unerwartet getrennt: %s"
@@ -5794,7 +5863,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:492
+#: camel/providers/imap/camel-imap-store.c:494
 msgid "Bad authentication response from server."
 msgstr "Ung�ltige Legitimationsantwort vom Server."
 
@@ -5812,7 +5881,7 @@ msgstr "Unbekannter Legitimationszustand."
 
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:302
-#: camel/providers/pop3/camel-pop3-provider.c:68 mail/mail-config.glade.h:54
+#: camel/providers/pop3/camel-pop3-provider.c:68 mail/mail-config.glade.h:55
 msgid "Password"
 msgstr "Passwort"
 
@@ -5841,37 +5910,37 @@ msgstr "POP-vor-SMTP-Authentifikation mit einer Nicht-POP-Quelle"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Fehler beim Compilieren eines regul�ren Ausdrucks: %s: %s"
 
-#: camel/camel-service.c:154
+#: camel/camel-service.c:157
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' ben�tigt einen Benutzernamen-Teil"
 
-#: camel/camel-service.c:162
+#: camel/camel-service.c:165
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' braucht einen Rechnernamen-Teil"
 
-#: camel/camel-service.c:170
+#: camel/camel-service.c:173
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%ss' braucht einen Pfad-Teil"
 
-#: camel/camel-service.c:548
+#: camel/camel-service.c:602
 #, c-format
 msgid "Resolving: %s"
 msgstr "%s wird aufgel�st"
 
-#: camel/camel-service.c:575
+#: camel/camel-service.c:629
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Fehler beim Aufl�sen eines Namens: %s"
 
-#: camel/camel-service.c:600
+#: camel/camel-service.c:654
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Finden eines Rechners fehlgeschlagen: %s: Rechner nicht gefunden"
 
-#: camel/camel-service.c:602
+#: camel/camel-service.c:656
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Finden eines Rechners fehlgeschlagen: %s: unbekannter Grund"
@@ -5884,12 +5953,12 @@ msgstr "E-Mail-Quelle: Virtueller Ordner"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Zum Lesen von Mail in Form einer Abfrage �ber andere Ordner"
 
-#: camel/camel-session.c:322 camel/camel-session.c:391
+#: camel/camel-session.c:324 camel/camel-session.c:393
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Keine Quelle f�r Protokoll `%s' verf�gbar"
 
-#: camel/camel-session.c:508
+#: camel/camel-session.c:510
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -5940,7 +6009,7 @@ msgstr "Zertifikate konnten nicht verifiziert werden."
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Ordnersperre auf %s kann nicht erzeugt werden: %s"
 
-#: camel/camel-tcp-stream-openssl.c:463
+#: camel/camel-tcp-stream-openssl.c:491
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -5950,7 +6019,7 @@ msgstr ""
 "Betreff: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:369
+#: camel/camel-tcp-stream-openssl.c:496 camel/camel-tcp-stream-ssl.c:369
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -5989,17 +6058,37 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "URL `%s' konnte nicht geparst werden"
 
-#: camel/camel-vee-folder.c:546
+#: camel/camel-vee-folder.c:554
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Nachricht %s gibt es in %s nicht"
 
-#: camel/camel-vee-folder.c:641
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message: %s"
 msgstr "Nachricht gibt es nicht: %s"
 
-#: camel/camel-vtrash-folder.c:106
+#: camel/camel-vee-store.c:250
+#, fuzzy, c-format
+msgid "Cannot delete folder: %s: Invalid operation"
+msgstr "Ordnersperre auf %s kann nicht erzeugt werden: %s"
+
+#: camel/camel-vee-store.c:286
+#, fuzzy, c-format
+msgid "Cannot delete folder: %s: No such folder"
+msgstr "Ordner kann nicht abgerufen werden: %s: %s"
+
+#: camel/camel-vee-store.c:298
+#, fuzzy, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "Ordnersperre auf %s kann nicht erzeugt werden: %s"
+
+#: camel/camel-vee-store.c:326
+#, fuzzy, c-format
+msgid "Cannot rename folder: %s: No such folder"
+msgstr "Ordner kann nicht abgerufen werden: %s: %s"
+
+#: camel/camel-vtrash-folder.c:109
 msgid "You cannot copy messages from this trash folder."
 msgstr "Sie k�nnen keine Nachrichten aus diesem M�llordner kopieren."
 
@@ -6047,7 +6136,7 @@ msgid "Scanning for changed messages"
 msgstr "Suchen nach ge�nderten Nachrichten"
 
 #: camel/providers/imap/camel-imap-folder.c:1491
-#: camel/providers/imap/camel-imap-folder.c:1890
+#: camel/providers/imap/camel-imap-folder.c:1899
 msgid "This message is not currently available"
 msgstr "Diese Nachricht ist derzei nicht verf�gbar"
 
@@ -6060,7 +6149,7 @@ msgstr "�berblickinformation f�r neue Nachrichten wird abgerufen"
 msgid "Scanning for new messages"
 msgstr "Suchen nach neuen Nachrichten"
 
-#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/imap/camel-imap-folder.c:1936
 msgid "Could not find message body in FETCH response."
 msgstr "Nachrichtenrumpf in Antwort auf FETCH konnte nicht gefunden werden."
 
@@ -6077,7 +6166,7 @@ msgstr "Cache-Verzeichnis konnte nicht ge�ffnet werden: %s"
 msgid "Failed to cache message %s: %s"
 msgstr "Nachricht konnte nicht dekodiert werden."
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:14
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:15
 msgid "Checking for new mail"
 msgstr "Nach neuer Mail sehen"
 
@@ -6085,7 +6174,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:733
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:767
 msgid "Folders"
 msgstr "Ordner"
 
@@ -6119,29 +6208,29 @@ msgstr ""
 "Diese Option verbindet zum IMAP-Server mit einem unverschl�sselten "
 "Passwortes."
 
-#: camel/providers/imap/camel-imap-store.c:515
+#: camel/providers/imap/camel-imap-store.c:517
 #, 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:525
+#: camel/providers/imap/camel-imap-store.c:527
 #: camel/providers/smtp/camel-smtp-transport.c:388
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Keine Unterst�tzung f�r Legitimationstyp %s"
 
-#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap/camel-imap-store.c:551
 #, 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:564
+#: camel/providers/imap/camel-imap-store.c:566
 #: camel/providers/smtp/camel-smtp-transport.c:432
 msgid "You didn't enter a password."
 msgstr "Sie haben kein Passwort eingegeben."
 
-#: camel/providers/imap/camel-imap-store.c:590
+#: camel/providers/imap/camel-imap-store.c:592
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6152,12 +6241,12 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:889
+#: camel/providers/imap/camel-imap-store.c:891
 #, c-format
 msgid "No such folder %s"
 msgstr "Ordner %s gibt es nicht"
 
-#: camel/providers/imap/camel-imap-store.c:1090
+#: camel/providers/imap/camel-imap-store.c:1131
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Der Elternordner darf keine Unterordner enthalten"
 
@@ -6190,51 +6279,51 @@ msgstr "Maildateien im Qmail-maildir-Format"
 msgid "For storing local mail in qmail maildir directories."
 msgstr "Zum Speichern lokaler Mail in qmail-maildir-Verzeichnissen."
 
-#: camel/providers/local/camel-local-provider.c:77
+#: camel/providers/local/camel-local-provider.c:78
 msgid "Standard Unix mbox spools"
 msgstr "Standard-Unix-mbox-Spools"
 
-#: camel/providers/local/camel-local-provider.c:78
+#: camel/providers/local/camel-local-provider.c:79
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr "Zum Lesen und Speichern lokaler Mail in normalen mbox-Spooldateien."
 
-#: camel/providers/local/camel-local-store.c:127
-#: camel/providers/local/camel-spool-store.c:112
+#: camel/providers/local/camel-local-store.c:132
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Speicherungswurzel %s ist kein absoluter Pfad"
 
-#: camel/providers/local/camel-local-store.c:134
+#: camel/providers/local/camel-local-store.c:139
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Speicherwurzel `%s' ist kein regul�res Verzeichnis."
 
-#: camel/providers/local/camel-local-store.c:142
-#: camel/providers/local/camel-local-store.c:158
+#: camel/providers/local/camel-local-store.c:147
+#: camel/providers/local/camel-local-store.c:163
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Ordner kann nicht abgerufen werden: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:173
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "Lokale Speicher haben keinen Posteingangsordner"
 
-#: camel/providers/local/camel-local-store.c:183
+#: camel/providers/local/camel-local-store.c:190
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokale Maildatei %s"
 
-#: camel/providers/local/camel-local-store.c:240
+#: camel/providers/local/camel-local-store.c:247
 #, 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:282
+#: camel/providers/local/camel-local-store.c:289
 #, 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:292
+#: camel/providers/local/camel-local-store.c:299
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Ordner-Indexdatei `%s' konnte nicht gel�scht werden: %s"
@@ -6519,26 +6608,26 @@ msgstr "MH-Verzeichnispfad kann nicht ge�ffnet werden: %s: %s"
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "Nachricht kann nicht an Spool-Datei angeh�ngt werden: %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:133
+#: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Spool `%s' does not exist or is not a regular file"
 msgstr "Spool '%s' existiert nicht oder ist keine regul�re Datei"
 
-#: camel/providers/local/camel-spool-store.c:159
+#: camel/providers/local/camel-spool-store.c:142
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Ordner `%s/%s' existiert nicht."
 
-#: camel/providers/local/camel-spool-store.c:181
+#: camel/providers/local/camel-spool-store.c:164
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Spool-Maildatei %s"
 
-#: camel/providers/local/camel-spool-store.c:227
+#: camel/providers/local/camel-spool-store.c:210
 msgid "Spool folders cannot be renamed"
 msgstr "Spool-Ordner k�nnen nicht umbenannt werden"
 
-#: camel/providers/local/camel-spool-store.c:235
+#: camel/providers/local/camel-spool-store.c:218
 msgid "Spool folders cannot be deleted"
 msgstr "Spool-Ordner k�nnen nicht gel�scht werden"
 
@@ -6667,31 +6756,31 @@ msgstr "Abrufen der POP-Zusammenfassung"
 msgid "Could not check POP server for new messages: %s"
 msgstr "POP-Server konnte nicht auf neue Nachrichten �berpr�ft werden: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:235
+#: camel/providers/pop3/camel-pop3-folder.c:242
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 "Ordner konnte nicht ge�ffnet werden: Nachrichtenliste war unvollst�ndig."
 
-#: camel/providers/pop3/camel-pop3-folder.c:259
+#: camel/providers/pop3/camel-pop3-folder.c:266
 msgid "Expunging deleted messages"
 msgstr "Gel�schte Nachrichten werden ausger�umt"
 
-#: camel/providers/pop3/camel-pop3-folder.c:335
+#: camel/providers/pop3/camel-pop3-folder.c:342
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "Nachricht konnte nicht abgeholt werden: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:351
+#: camel/providers/pop3/camel-pop3-folder.c:358
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Nachricht konnte nicht vom POP-Server %s abgerufen werden: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:374
+#: camel/providers/pop3/camel-pop3-folder.c:381
 #, c-format
 msgid "No message with uid %s"
 msgstr "Keine Nachricht mit UID %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:378
+#: camel/providers/pop3/camel-pop3-folder.c:385
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Abrufen der POP-Nachricht %d"
@@ -6709,7 +6798,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:51 mail/mail-config.glade.h:53
+#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:54
 msgid "POP"
 msgstr "POP"
 
@@ -6804,7 +6893,7 @@ msgid "Unexpected response from POP server: %s"
 msgstr "Unerwartete Antwort von POP-Server: %s"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:73
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -6859,7 +6948,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Mailauslieferung �ber das Programm sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:66
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -7492,13 +7581,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:309 e-util/e-time-utils.c:396
-#: widgets/misc/e-dateedit.c:1360 widgets/misc/e-dateedit.c:1587
+#: widgets/misc/e-dateedit.c:1385 widgets/misc/e-dateedit.c:1612
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:313 e-util/e-time-utils.c:388
-#: widgets/misc/e-dateedit.c:1357 widgets/misc/e-dateedit.c:1584
+#: widgets/misc/e-dateedit.c:1382 widgets/misc/e-dateedit.c:1609
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -7649,8 +7738,8 @@ msgstr ""
 "Bitte gehen Sie zur�ck und w�hlen Sie einen g�ltigen Ordner zum Ausliefern "
 "der Mail."
 
-#: filter/filter-folder.c:232 filter/vfolder-rule.c:351
-#: mail/mail-account-gui.c:820
+#: filter/filter-folder.c:232 filter/vfolder-rule.c:356
+#: mail/mail-account-gui.c:822
 msgid "Select Folder"
 msgstr "Ordner w�hlen"
 
@@ -7900,7 +7989,7 @@ msgstr "Beantwortet an"
 msgid "Score"
 msgstr "Bewertung"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1242
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1251
 msgid "Sender"
 msgstr "Absender"
 
@@ -7932,7 +8021,7 @@ msgstr "beginnt mit"
 msgid "Stop Processing"
 msgstr "Verarbeitung abbrechen"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:893
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:917
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Betreff"
@@ -7961,7 +8050,7 @@ msgstr "Regel bearbeiten"
 msgid "Score Rules"
 msgstr "Bewertungsregeln"
 
-#: filter/vfolder-rule.c:203
+#: filter/vfolder-rule.c:206
 msgid "Oops.  You need to to specify at least one folder as a source."
 msgstr "Oops. Sie m�ssen mindestens einen Ordner als Quelle angeben."
 
@@ -7979,19 +8068,19 @@ msgstr "Importieren..."
 msgid "Please wait"
 msgstr "Bitte warten"
 
-#: importers/elm-importer.c:171 importers/netscape-importer.c:701
+#: importers/elm-importer.c:171 importers/netscape-importer.c:708
 #: importers/pine-importer.c:369
 #, c-format
 msgid "Importing %s as %s"
 msgstr "Importieren von %s als %s"
 
-#: importers/elm-importer.c:377 importers/netscape-importer.c:794
+#: importers/elm-importer.c:377 importers/netscape-importer.c:801
 #: importers/pine-importer.c:506
 #, c-format
 msgid "Scanning %s"
 msgstr "%s wird abgetastet"
 
-#: importers/elm-importer.c:528 importers/netscape-importer.c:967
+#: importers/elm-importer.c:528 importers/netscape-importer.c:974
 #: importers/pine-importer.c:669 mail/component-factory.c:96
 msgid "Mail"
 msgstr "Mail"
@@ -8028,19 +8117,19 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importiert Ihre alten Netscape-Daten"
 
-#: importers/netscape-importer.c:897 importers/pine-importer.c:602
+#: importers/netscape-importer.c:904 importers/pine-importer.c:602
 msgid "Scanning directory"
 msgstr "Verzeichnis wird abgetastet"
 
-#: importers/netscape-importer.c:906
+#: importers/netscape-importer.c:913
 msgid "Starting import"
 msgstr "Import beginnt"
 
-#: importers/netscape-importer.c:972
+#: importers/netscape-importer.c:979
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: importers/netscape-importer.c:993
+#: importers/netscape-importer.c:1000
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8124,19 +8213,25 @@ msgstr "Eigenschaften..."
 msgid "Change this folder's properties"
 msgstr "Die Eigenschaften dieses Ordners �ndern"
 
-#: mail/component-factory.c:790
+#: mail/component-factory.c:698
+msgid ""
+"Some of your mail settings seem corrupt, please check that everything is in "
+"order."
+msgstr ""
+
+#: mail/component-factory.c:812
 msgid "New Mail Message"
 msgstr "Neue Mail-Nachricht"
 
-#: mail/component-factory.c:790
+#: mail/component-factory.c:812
 msgid "New _Mail Message"
 msgstr "Neue _Mail-Nachricht"
 
-#: mail/component-factory.c:821
+#: mail/component-factory.c:843
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolutions Mail-Komponente kann nicht initialisiert werden"
 
-#: mail/component-factory.c:1007
+#: mail/component-factory.c:1032
 msgid "Cannot register storage with shell"
 msgstr "Speicher kann nicht bei der Shell registriert werden"
 
@@ -8149,159 +8244,159 @@ msgstr "Eigenschaften von \"%s\""
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: mail/folder-browser.c:239 mail/mail-display.c:275
+#: mail/folder-browser.c:262 mail/mail-display.c:275
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Tempor�res Verzeichnis konnte nicht angelegt werden: %s"
 
-#: mail/folder-browser.c:708
+#: mail/folder-browser.c:734
 #, c-format
 msgid "%d new"
 msgstr "%d neu"
 
-#: mail/folder-browser.c:711 mail/folder-browser.c:716
-#: mail/folder-browser.c:720
+#: mail/folder-browser.c:737 mail/folder-browser.c:742
+#: mail/folder-browser.c:746
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:712
+#: mail/folder-browser.c:738
 #, c-format
 msgid "%d hidden"
 msgstr "%d verborgen"
 
-#: mail/folder-browser.c:717
+#: mail/folder-browser.c:743
 #, c-format
 msgid "%d selected"
 msgstr "%d ausgew�hlt"
 
-#: mail/folder-browser.c:722
+#: mail/folder-browser.c:748
 #, c-format
 msgid "%d unsent"
 msgstr "%d nicht verschickt"
 
-#: mail/folder-browser.c:724
+#: mail/folder-browser.c:750
 #, c-format
 msgid "%d total"
 msgstr "%d insgesamt"
 
-#: mail/folder-browser.c:958
+#: mail/folder-browser.c:993
 msgid "Create vFolder from Search"
 msgstr "vOrdner aus Suche erzeugen"
 
-#: mail/folder-browser.c:1303
+#: mail/folder-browser.c:1338
 msgid "VFolder on _Subject"
 msgstr "VOrdner �ber _Betreff"
 
-#: mail/folder-browser.c:1306
+#: mail/folder-browser.c:1341
 msgid "VFolder on Se_nder"
 msgstr "VOrdner �ber Absender"
 
-#: mail/folder-browser.c:1309
+#: mail/folder-browser.c:1344
 msgid "VFolder on _Recipients"
 msgstr "VOrdner �ber Empf�nger"
 
-#: mail/folder-browser.c:1312
+#: mail/folder-browser.c:1347
 msgid "VFolder on Mailing _List"
 msgstr "VOrdner �ber Mailing_liste"
 
-#: mail/folder-browser.c:1318
+#: mail/folder-browser.c:1353
 msgid "Filter on Sub_ject"
 msgstr "Filter �ber _Betreff"
 
-#: mail/folder-browser.c:1321
+#: mail/folder-browser.c:1356
 msgid "Filter on Sen_der"
 msgstr "Filter �ber _Absender"
 
-#: mail/folder-browser.c:1324
+#: mail/folder-browser.c:1359
 msgid "Filter on Re_cipients"
 msgstr "Filter �ber _Empf�nger"
 
-#: mail/folder-browser.c:1327
+#: mail/folder-browser.c:1362
 msgid "Filter on _Mailing List"
 msgstr "Filter �ber _Mailingliste"
 
-#: mail/folder-browser.c:1338 ui/evolution-mail-message.xml.h:89
+#: mail/folder-browser.c:1373 ui/evolution-mail-message.xml.h:89
 msgid "_Edit as New Message..."
 msgstr "Als neue Nachricht _bearbeiten..."
 
-#: mail/folder-browser.c:1340 ui/evolution-mail-message.xml.h:97
+#: mail/folder-browser.c:1375 ui/evolution-mail-message.xml.h:97
 msgid "_Save As..."
 msgstr "Speichern _unter..."
 
-#: mail/folder-browser.c:1342
+#: mail/folder-browser.c:1377
 msgid "_Print"
 msgstr "Drucken"
 
-#: mail/folder-browser.c:1347 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1382 ui/evolution-mail-message.xml.h:96
 msgid "_Reply to Sender"
 msgstr "Antwort an Ab_sender"
 
-#: mail/folder-browser.c:1349 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1384 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _List"
 msgstr "_Liste antworten"
 
-#: mail/folder-browser.c:1351 ui/evolution-mail-message.xml.h:68
+#: mail/folder-browser.c:1386 ui/evolution-mail-message.xml.h:68
 msgid "Reply to _All"
 msgstr "_Allen antworten"
 
-#: mail/folder-browser.c:1353
+#: mail/folder-browser.c:1388
 msgid "_Forward"
 msgstr "Weiterleiten"
 
-#: mail/folder-browser.c:1356 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1391 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "Als gelesen markieren"
 
-#: mail/folder-browser.c:1358 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1393 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Als ungelesen markieren"
 
-#: mail/folder-browser.c:1360
+#: mail/folder-browser.c:1395
 msgid "Mark as _Important"
 msgstr "Als _wichtig markieren"
 
-#: mail/folder-browser.c:1362
+#: mail/folder-browser.c:1397
 msgid "Mark as Unim_portant"
 msgstr "Als _unwichtig markieren"
 
-#: mail/folder-browser.c:1367
+#: mail/folder-browser.c:1402
 msgid "_Move to Folder..."
 msgstr "In Ordner verschieben..."
 
-#: mail/folder-browser.c:1369
+#: mail/folder-browser.c:1404
 msgid "_Copy to Folder..."
 msgstr "In Ordner kopieren..."
 
-#: mail/folder-browser.c:1373 ui/evolution-mail-message.xml.h:99
+#: mail/folder-browser.c:1408 ui/evolution-mail-message.xml.h:99
 msgid "_Undelete"
 msgstr "L�schen r�ckg�ngig"
 
-#: mail/folder-browser.c:1378
+#: mail/folder-browser.c:1413
 msgid "Add Sender to Address Book"
 msgstr "Absender zu Adressbuch hinzuf�gen"
 
-#: mail/folder-browser.c:1383
+#: mail/folder-browser.c:1418
 msgid "Apply Filters"
 msgstr "Filter anwenden"
 
-#: mail/folder-browser.c:1387
+#: mail/folder-browser.c:1422
 msgid "Create Ru_le From Message"
 msgstr "_Regel aus Nachricht erzeugen"
 
-#: mail/folder-browser.c:1538
+#: mail/folder-browser.c:1573
 msgid "Filter on Mailing List"
 msgstr "Filter �ber Mailingliste"
 
-#: mail/folder-browser.c:1539
+#: mail/folder-browser.c:1574
 msgid "VFolder on Mailing List"
 msgstr "VOrdner �ber Mailingliste"
 
-#: mail/folder-browser.c:1541
+#: mail/folder-browser.c:1576
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filter �ber Mailingliste (%s)"
 
-#: mail/folder-browser.c:1542
+#: mail/folder-browser.c:1577
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "VOrdner �ber Mailingliste (%s)"
@@ -8375,16 +8470,16 @@ msgstr "Evolution-News-Editor"
 msgid "Evolution Account Editor"
 msgstr "Evolution-Accounteditor"
 
-#: mail/mail-account-gui.c:945
+#: mail/mail-account-gui.c:947
 #, fuzzy
 msgid "Could not save signature file."
 msgstr "PGP-Signaturkontext konnte nicht angelegt werden."
 
-#: mail/mail-account-gui.c:1022
+#: mail/mail-account-gui.c:1024
 msgid "Save signature"
 msgstr "Signatur speichern"
 
-#: mail/mail-account-gui.c:1028
+#: mail/mail-account-gui.c:1030
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -8394,7 +8489,7 @@ msgstr ""
 "\n"
 "M�chten Sie Ihre �nderungen speichern?"
 
-#: mail/mail-account-gui.c:1611
+#: mail/mail-account-gui.c:1615
 msgid "You may not create two accounts with the same name."
 msgstr "Sie k�nnen keine zwei Zug�nge mit demselben Namen anlegen."
 
@@ -8427,7 +8522,7 @@ msgid "Are you sure you want to delete this news account?"
 msgstr "Sind Sie sicher, dass Sie diesen News-Account l�schen wollen?"
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:757 mail/mail-config.glade.h:42
+#: mail/mail-accounts.c:760 mail/mail-config.glade.h:45
 msgid "Mail Settings"
 msgstr "Mail-Einstellungen"
 
@@ -8535,37 +8630,37 @@ msgstr ""
 msgid "This message contains invalid recipients:"
 msgstr "Diese Nachricht enth�lt ausschlie�lich BCC-Empf�nger."
 
-#: mail/mail-callbacks.c:453
+#: mail/mail-callbacks.c:454
 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:549
+#: mail/mail-callbacks.c:550
 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:779
+#: mail/mail-callbacks.c:783
 msgid "an unknown sender"
 msgstr "ein unbekannter Absender"
 
-#: mail/mail-callbacks.c:784
+#: mail/mail-callbacks.c:788
 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:1162
+#: mail/mail-callbacks.c:1171
 msgid "Move message(s) to"
 msgstr "Machricht(en) verschieben in"
 
-#: mail/mail-callbacks.c:1164
+#: mail/mail-callbacks.c:1173
 msgid "Copy message(s) to"
 msgstr "Machricht(en) kopieren in"
 
-#: mail/mail-callbacks.c:1538
+#: mail/mail-callbacks.c:1547
 #, 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:1560
+#: mail/mail-callbacks.c:1569
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -8573,7 +8668,7 @@ msgstr ""
 "Sie k�nnen nur im Entw�rfe-Ordner\n"
 "abgespeicherte Nachrichten bearbeiten."
 
-#: mail/mail-callbacks.c:1594
+#: mail/mail-callbacks.c:1603
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -8581,29 +8676,29 @@ msgstr ""
 "Sie k�nnen nur Nachrichten im\n"
 "Verschickt-Ordner neu verschicken."
 
-#: mail/mail-callbacks.c:1606
+#: mail/mail-callbacks.c:1615
 #, 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:1627
+#: mail/mail-callbacks.c:1636
 msgid "No Message Selected"
 msgstr "Keine Nachricht ausgew�hlt"
 
-#: mail/mail-callbacks.c:1712
+#: mail/mail-callbacks.c:1721
 msgid "Save Message As..."
 msgstr "Nachricht speichern unter..."
 
-#: mail/mail-callbacks.c:1714
+#: mail/mail-callbacks.c:1723
 msgid "Save Messages As..."
 msgstr "Nachrichten speichern unter..."
 
-#: mail/mail-callbacks.c:1859 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:1868 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Warnung"
 
-#: mail/mail-callbacks.c:1864
+#: mail/mail-callbacks.c:1873
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8616,11 +8711,11 @@ msgstr ""
 "\n"
 "Nachrichten wirklich entfernen?"
 
-#: mail/mail-callbacks.c:1871
+#: mail/mail-callbacks.c:1880
 msgid "Do not ask me again."
 msgstr "Mich nicht mehr fragen."
 
-#: mail/mail-callbacks.c:1976
+#: mail/mail-callbacks.c:1985
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -8629,19 +8724,19 @@ msgstr ""
 "Fehler beim Laden von Filterinformation:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1986
+#: mail/mail-callbacks.c:1995
 msgid "Filters"
 msgstr "Filter"
 
-#: mail/mail-callbacks.c:2032
+#: mail/mail-callbacks.c:2041
 msgid "Print Message"
 msgstr "Nachricht drucken"
 
-#: mail/mail-callbacks.c:2078
+#: mail/mail-callbacks.c:2087
 msgid "Printing of message failed"
 msgstr "Drucken der Nachricht fehlgeschlagen"
 
-#: mail/mail-callbacks.c:2162
+#: mail/mail-callbacks.c:2171
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -8707,88 +8802,109 @@ msgstr ""
 msgid "Evolution Account Assistant"
 msgstr "Evolution-Zugangsdruide"
 
-#: mail/mail-config.c:1486
-#, fuzzy
-msgid "Evolution Shortcuts"
-msgstr "Evolution"
+#: mail/mail-config.c:315
+#, fuzzy, c-format
+msgid "Account %d"
+msgstr "Zugang"
 
-#. right now, the URL always works basically as a matter of luck...
-#. * both IMAP and mbox spool stores have INBOX as their inbox folder
-#. * name. I don't think this will work with maildir. How can we figure out
-#. * what shortcut to insert?
-#.
 #: mail/mail-config.c:1618
 #, c-format
+msgid ""
+"Could not get inbox for new mail store:\n"
+"%s\n"
+"No shortcut will be created."
+msgstr ""
+
+#. Create the shortcut. FIXME: This only works if the
+#. * full name matches the path.
+#.
+#: mail/mail-config.c:1629
+#, c-format
 msgid "%s: Inbox"
 msgstr "%s: Posteingang"
 
-#: mail/mail-config.c:1851
+#: mail/mail-config.c:1873
 msgid "Checking Service"
 msgstr "Dienst wird �berpr�ft"
 
-#: mail/mail-config.c:1922 mail/mail-config.c:1925
+#: mail/mail-config.c:1944 mail/mail-config.c:1947
 msgid "Connecting to server..."
 msgstr "Verbindung zu Server..."
 
 #: mail/mail-config.glade.h:1
+#, fuzzy
+msgid " _Check for supported types "
+msgstr "_Pr�fen, welche Typen unterst�tzt werden "
+
+#: mail/mail-config.glade.h:2
 msgid " color"
 msgstr " Farbe"
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL wird von dieser Bin�rversion von Evolution nicht unterst�tzt)"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr "Zugang"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr "Zugangsinformation"
 
-#: mail/mail-config.glade.h:5 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:6 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Zugangsverwaltung"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "Accounts"
 msgstr "Zug�nge"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr ""
 "Beim Verschicken verschl�sselter Mail immer vor mir selber verschl�sseln"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr ""
 "Beim Verschicken verschl�sselter Mail immer vor mir selber verschl�sseln"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:10
 msgid "Always sign outgoing messages when using this account"
 msgstr "Bei Verwendung dieses Zugangs ausgehende Nachrichten immer signieren"
 
-#: mail/mail-config.glade.h:10 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Anlage"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:12
 msgid "Authentication"
 msgstr "Legitimation"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:13
 msgid "Authentication Type: "
 msgstr "Legitimations-Typ: "
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:14
 msgid "Certificate ID:"
 msgstr "Kennung des Zertifikats:"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:16
 msgid "Composer"
 msgstr "Maileditor"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:17
+#, fuzzy
+msgid "Configuration"
+msgstr "Mailkonfiguration"
+
+#: mail/mail-config.glade.h:18
+#, fuzzy
+msgid "Confirm when Expunging a folder"
+msgstr "Ordner wird ges�ubert"
+
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -8806,238 +8922,226 @@ msgstr ""
 "Klicken Sie auf \"Beenden\", um Ihre Einstellungen zu\n"
 "speichern."
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr "_Vorgabe"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:26
 msgid "Default Forward style is: "
 msgstr "Vorgegebener Weiterleitungsstil ist: "
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:27
 msgid "Default character encoding: "
 msgstr "Vorgegebene Zeichenkodierung: "
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:29
 msgid "Digital IDs..."
 msgstr "Digitale Kennungen..."
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:30
 msgid "Display"
 msgstr "Anzeige"
 
-#: mail/mail-config.glade.h:27 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:31 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Fertig"
 
-#: mail/mail-config.glade.h:28 shell/e-local-storage.c:174
+#: mail/mail-config.glade.h:32 shell/e-local-storage.c:174
 msgid "Drafts"
 msgstr "Entw�rfe"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:33
 msgid "Drafts folder:"
 msgstr "Entw�rfe-Ordner:"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:34
 msgid "E_nable"
 msgstr "_Aktivieren"
 
-#: mail/mail-config.glade.h:31
-msgid "Each account must have a different name."
-msgstr "Alle Zug�nge brauchen unterschiedliche Namen."
-
-#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:96
 #: widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr "Bearbeiten..."
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:36
 msgid "Enabled"
 msgstr "Aktiv"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:37
 msgid "Get Digital ID..."
 msgstr "Digitale Kennung erhalten..."
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:38
 msgid "HTML signature file:"
 msgstr "HTML-Signaturdatei:"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:39
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:40 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Identit�t"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:41
 msgid "In HTML mail"
 msgstr "In HTML-Mail"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:42
 msgid "Inline"
 msgstr "An Ort und Stelle"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:43
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:44
 msgid "Mail Configuration"
 msgstr "Mailkonfiguration"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:46
 msgid "Mailbox location"
 msgstr "Ort des Postfachs"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:47
 msgid "Make this my _default account"
 msgstr "Dies zu meinem _Vorgabezugang machen"
 
-#: mail/mail-config.glade.h:45
-msgid "Message _preview should be displayed by default"
-msgstr "Nachrichten_vorschau sollte per Vorgabe angezeigt werden"
-
-#: mail/mail-config.glade.h:46
-msgid "Message list should display in a _threaded fashion by default"
-msgstr "Nachrichtenliste sollte per Vorgabe zu _Threads geordnet sein"
-
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 msgid "NNTP Server:"
 msgstr "NNTP-Server:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:49
 msgid "News"
 msgstr "Nachrichten"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:51
 msgid "Optional Information"
 msgstr "Optionale Information"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:53
 msgid "PGP Key ID:"
 msgstr "PGP-Schl�sselkennung:"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 msgid "Pick a color"
 msgstr "Eine Farbe ausw�hlen"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 msgid "Pretty Good Privacy"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 msgid "Prompt when sending messages with an _empty subject"
 msgstr "Beim Abschicken von Nachrichten mit _leerem Betreff nachfragen"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 msgid "Prompt 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:59
+#: mail/mail-config.glade.h:60
 msgid "Qmail maildir "
 msgstr "Qmail-maildir "
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:61
 msgid "Quoted"
 msgstr "Umschrieben"
 
-#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Erhalten von E-Mail"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:63
 msgid "Receiving Mail"
 msgstr "ERhalten von Mail"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:64
 msgid "Receiving Options"
 msgstr "Empfangs-Optionen"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:65
 msgid "Required Information"
 msgstr "Ben�tigte Information"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:67
 msgid "Secure MIME"
 msgstr "Sichere MIME"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:68
 msgid "Security"
 msgstr "Sicherheit"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:69
 msgid "Select Filter Log file..."
 msgstr "Eine Filterprotokoll-Datei w�hlen..."
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:70
 msgid "Select PGP binary"
 msgstr "PGP-Bin�rdatei w�hlen"
 
-#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:71 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Verschicken von E-Mail"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:72
 msgid "Sending Mail"
 msgstr "Verschicken von Mail"
 
-#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:74 mail/message-list.etspec.h:6
 #: shell/e-local-storage.c:177
 msgid "Sent"
 msgstr "Verschickt"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:75
 msgid "Sent and Draft Messages"
 msgstr "Nachrichten in \"Verschickt\" und \"Entw�rfe\""
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:76
 msgid "Sent messages folder:"
 msgstr "Ordner f�r verschickte Nachrichten:"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:77
 msgid "Server Configuration"
 msgstr "Server-Konfiguration"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 msgid "Server Type: "
 msgstr "Servertyp: "
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 msgid "Server requires _authentication"
 msgstr "Server ben�tigt _Legitimation"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:80
 msgid "Signature file:"
 msgstr "Signaturdatei:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "Source"
 msgstr "Quelle"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 msgid "Source Information"
 msgstr "Quellinformation"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:83
 msgid "Sources"
 msgstr "Quellen"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
 msgid "Special Folders"
 msgstr "Besondere Ordner"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:85
 msgid "Standard Unix mbox"
 msgstr "Standard-Unix-mbox"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:87
 msgid "Use secure connection (_SSL)"
 msgstr "Sichere Verbindung (_SSL) verwenden"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:88
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -9047,78 +9151,74 @@ msgstr ""
 "\n"
 "Klicken Sie \"Weiter\" zum Beginnen."
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:92
 msgid "_Always load images off the net"
 msgstr "Bilder _immer aus dem Netz laden"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:93
 msgid "_Automatically check for new mail every"
 msgstr "_Automatisch nach neuer Mail sehen alle"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:94
 msgid "_Check for supported types"
 msgstr "_Pr�fen, welche Typen unterst�tzt werden "
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:97
 msgid "_Email Address:"
 msgstr "_E-Mail-Adresse:"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:98
 msgid "_Empty trash folders on exit"
 msgstr "M�llordner beim Beenden _leeren"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 msgid "_Full Name:"
 msgstr "_Voller Name:"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "_HTML Signature:"
 msgstr "_HTML-Signatur:"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 msgid "_Highlight citations with"
 msgstr "Zitate _hervorheben mit"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:102
 msgid "_Host:"
 msgstr "_Rechner:"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 msgid "_Load images if sender is in addressbook"
 msgstr "Bilder _laden, falls Absender im Adressbuch ist"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 msgid "_Log filter actions to:"
 msgstr "Filteraktionen mit_protokollieren in:"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 msgid "_Mark messages as Read after"
 msgstr "_Nachrichten als gelesen markieren nach"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "_Name:"
 msgstr "_Name:"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 msgid "_Never load images off the net"
 msgstr "Bilder _nie aus dem Netz laden"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 msgid "_Organization:"
 msgstr "_Organisation:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:109
 msgid "_PGP binary path:"
 msgstr "Pfad zur _PGP-Bin�rdatei:"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 msgid "_Path:"
 msgstr "_Pfad:"
 
-#: mail/mail-config.glade.h:110
-msgid "_Remember PGP Passphrase until exit"
-msgstr "_PGP-Passphrase bis zum Beenden behalten"
-
 #: mail/mail-config.glade.h:111
 msgid "_Remember this password"
 msgstr "Dieses Passwort _behalten"
@@ -9151,39 +9251,39 @@ msgstr "Platzhalter"
 msgid "seconds."
 msgstr "Sekunden."
 
-#: mail/mail-crypto.c:60
+#: mail/mail-crypto.c:59
 msgid "Could not create a PGP signature context."
 msgstr "PGP-Signaturkontext konnte nicht angelegt werden."
 
-#: mail/mail-crypto.c:86
+#: mail/mail-crypto.c:84
 msgid "Could not create a PGP verification context."
 msgstr "PGP-�berpr�fungskontext konnte nicht angelegt werden."
 
-#: mail/mail-crypto.c:116
+#: mail/mail-crypto.c:113
 msgid "Could not create a PGP encryption context."
 msgstr "PGP-Verschl�sselungskontext konnte nicht angelegt werden."
 
-#: mail/mail-crypto.c:142
+#: mail/mail-crypto.c:138
 msgid "Could not create a PGP decryption context."
 msgstr "PGP-Entschl�sselungskontext konnte nicht angelegt werden."
 
-#: mail/mail-crypto.c:177
+#: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
 msgstr "S/MIME-Signaturkontext konnte nicht angelegt werden."
 
-#: mail/mail-crypto.c:209
+#: mail/mail-crypto.c:205
 msgid "Could not create a S/MIME certsonly context."
 msgstr "S/MIME-certsonly-Kontext konnte nicht angelegt werden."
 
-#: mail/mail-crypto.c:240
+#: mail/mail-crypto.c:236
 msgid "Could not create a S/MIME encryption context."
 msgstr "S/MIME-Verschl�sselungskontext konnte nicht angelegt werden."
 
-#: mail/mail-crypto.c:271
+#: mail/mail-crypto.c:267
 msgid "Could not create a S/MIME envelope context."
 msgstr "S/MIME-Umschlagkontext konnte nicht angelegt werden."
 
-#: mail/mail-crypto.c:301
+#: mail/mail-crypto.c:297
 msgid "Could not create a S/MIME decode context."
 msgstr "S/MIME-Entschl�sselungskontext konnte nicht angelegt werden."
 
@@ -9229,11 +9329,11 @@ msgstr "Link in Browser �ffnen"
 msgid "Copy Link Location"
 msgstr "Linkziel kopieren"
 
-#: mail/mail-display.c:1519
+#: mail/mail-display.c:1520
 msgid "Save Link as (FIXME)"
 msgstr "Link speichern unter (FIXME)"
 
-#: mail/mail-display.c:1521
+#: mail/mail-display.c:1523
 msgid "Save Image as..."
 msgstr "Bild speichern unter..."
 
@@ -9251,88 +9351,88 @@ msgstr ""
 msgid "Date"
 msgstr "Datum"
 
-#: mail/mail-format.c:860
+#: mail/mail-format.c:862
 msgid "Bad Address"
 msgstr "Ung�ltige Adresse"
 
-#: mail/mail-format.c:882 mail/message-list.etspec.h:3
+#: mail/mail-format.c:903 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "Von"
 
-#: mail/mail-format.c:885
+#: mail/mail-format.c:906
 msgid "Reply-To"
 msgstr "Antwort an"
 
-#: mail/mail-format.c:888 mail/message-list.etspec.h:10
+#: mail/mail-format.c:910 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "An"
 
-#: mail/mail-format.c:891
+#: mail/mail-format.c:914
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:1311
+#: mail/mail-format.c:1357
 msgid "No GPG/PGP program configured."
 msgstr "Kein GPG/PGP-Programm konfiguriert."
 
-#: mail/mail-format.c:1327
+#: mail/mail-format.c:1373
 msgid "Encrypted message not displayed"
 msgstr "Verschl�sselte Nachricht nicht angezeigt"
 
-#: mail/mail-format.c:1338
+#: mail/mail-format.c:1384
 msgid "Encrypted message"
 msgstr "Verschl�sselte Nachricht"
 
-#: mail/mail-format.c:1339
+#: mail/mail-format.c:1385
 msgid "Click icon to decrypt."
 msgstr "Zum Entschl�sseln Icon klicken."
 
-#: mail/mail-format.c:1394
+#: mail/mail-format.c:1440
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 "Diese Nachricht ist digital signiert und wurde als authentisch nachgewiesen."
 
-#: mail/mail-format.c:1405
+#: mail/mail-format.c:1451
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "Diese Nachricht ist digital signiert, kann aber nicht als authentisch "
 "nachgewiesen werden."
 
-#: mail/mail-format.c:2083
+#: mail/mail-format.c:2128
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Zeiger auf FTP-Site (%s)"
 
-#: mail/mail-format.c:2097
+#: mail/mail-format.c:2142
 #, 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:2102
+#: mail/mail-format.c:2147
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Zeiger auf lokale Datei (%s)"
 
-#: mail/mail-format.c:2131
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Zeiger auf Daten im Netz (%s)"
 
-#: mail/mail-format.c:2139
+#: mail/mail-format.c:2184
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Zeiger auf unbekannte externe Daten (Typ \"%s\")"
 
-#: mail/mail-format.c:2144
+#: mail/mail-format.c:2189
 msgid "Malformed external-body part."
 msgstr "Ung�ltiger external-body-Teil."
 
-#: mail/mail-local.c:547
+#: mail/mail-local.c:563
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "Ordner wird aktualisiert"
 
-#: mail/mail-local.c:620
+#: mail/mail-local.c:636
 #, fuzzy, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -9341,44 +9441,44 @@ msgstr ""
 "Metainformationen zu Ordner k�nnen nicht gespeichert werden; Sie\n"
 "werden ihn wahrscheinlich nie mehr �ffnen k�nnen: %s"
 
-#: mail/mail-local.c:676
+#: mail/mail-local.c:689
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Ordnersperre auf %s kann nicht erzeugt werden: %s"
 
-#: mail/mail-local.c:722
+#: mail/mail-local.c:735
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 "Ordner kann nicht gel�scht werden:\n"
 "%s"
 
-#: mail/mail-local.c:1052
+#: mail/mail-local.c:1075
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Wandle Ordner \"%s\" in \"%s\"-Format um"
 
-#: mail/mail-local.c:1067
+#: mail/mail-local.c:1090
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1089
+#: mail/mail-local.c:1112
 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:1180
+#: mail/mail-local.c:1200
 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:1190
-#, c-format
-msgid "Reconfigure %s"
+#: mail/mail-local.c:1209
+#, fuzzy, c-format
+msgid "Reconfigure /%s"
 msgstr "%s neu konfigurieren"
 
-#: mail/mail-mt.c:188
+#: mail/mail-mt.c:199
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -9387,7 +9487,7 @@ msgstr ""
 "Fehler beim `%s':\n"
 "%s"
 
-#: mail/mail-mt.c:191
+#: mail/mail-mt.c:202
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -9397,21 +9497,25 @@ msgstr ""
 "%s"
 
 #. Remember the password?
-#: mail/mail-mt.c:454
+#: mail/mail-mt.c:509
 msgid "Remember this password"
 msgstr "Dieses Passwort speichern"
 
-#: mail/mail-mt.c:511
+#: mail/mail-mt.c:510
+msgid "Remember this password for the remainder of this session"
+msgstr ""
+
+#: mail/mail-mt.c:567
 #, fuzzy, c-format
 msgid "Enter Password for %s"
 msgstr "Bitte geben Sie Ihr Passwort f�r %s ein"
 
-#: mail/mail-mt.c:514
+#: mail/mail-mt.c:570
 #, fuzzy
 msgid "Enter Password"
 msgstr "Passwort"
 
-#: mail/mail-mt.c:824
+#: mail/mail-mt.c:886
 msgid "Working"
 msgstr "In Arbeit"
 
@@ -9567,6 +9671,11 @@ msgstr "Daten konnten nicht geschrieben werden: %s"
 msgid "Disconnecting from %s"
 msgstr "Verbindung mit %s wird getrennt"
 
+#: mail/mail-ops.c:2065
+#, fuzzy, c-format
+msgid "Reconnecting to %s"
+msgstr "Verbindung mit %s wird getrennt"
+
 #: mail/mail-search-dialogue.c:113
 msgid "_Search"
 msgstr "_Suchen"
@@ -9622,11 +9731,11 @@ msgstr ""
 msgid "Type: %s"
 msgstr "Typ:"
 
-#: mail/mail-send-recv.c:282
+#: mail/mail-send-recv.c:283
 msgid "Send & Receive Mail"
 msgstr "Mail erhalten und verschicken"
 
-#: mail/mail-send-recv.c:283
+#: mail/mail-send-recv.c:284
 #, fuzzy
 msgid "Cancel All"
 msgstr "Abbrechen"
@@ -9647,35 +9756,49 @@ msgstr "Storniert"
 msgid "User canceled operation."
 msgstr "Benutzer hat Aktion abgebrochen."
 
-#: mail/mail-tools.c:173
+#: mail/mail-tools.c:133
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Tempor�re Mbox `%s' konnte nicht angelegt werden: %s"
 
-#: mail/mail-tools.c:299
+#: mail/mail-tools.c:259
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Weitergeleitete Nachricht - %s"
 
-#: mail/mail-tools.c:303
+#: mail/mail-tools.c:263
 msgid "Forwarded message"
 msgstr "Weitergeleitete Nachricht"
 
-#: mail/mail-tools.c:439
+#: mail/mail-tools.c:396
 msgid "Forwarded Message"
 msgstr "Weitergeleitete Nachricht"
 
-#: mail/mail-vfolder.c:161
+#: mail/mail-vfolder.c:84
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Ordner %s wird angelegt"
 
-#: mail/mail-vfolder.c:435
+#: mail/mail-vfolder.c:201
+#, fuzzy, c-format
+msgid "Updating vfolders for uri: %s"
+msgstr "Taste Ordner in \"%s\" ab"
+
+#: mail/mail-vfolder.c:414
+#, c-format
+msgid ""
+"The following vFolder(s):\n"
+"%sUsed the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+
+#: mail/mail-vfolder.c:636
 #, fuzzy
 msgid "VFolders"
 msgstr "Ordner"
 
-#: mail/mail-vfolder.c:541
+#: mail/mail-vfolder.c:742
 msgid "New VFolder"
 msgstr "Neuer VOrdner"
 
@@ -9744,7 +9867,7 @@ msgstr "%a %I:%M %p"
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2331
+#: mail/message-list.c:2334
 msgid "Generating message list"
 msgstr "Erzeugen der Nachrichtenliste"
 
@@ -9829,32 +9952,32 @@ msgstr "Ab_bestellen"
 msgid "Evolution component for the executive summary."
 msgstr "Evolution-Komponente f�r die Chefsesselansicht"
 
-#: my-evolution/component-factory.c:30
+#: my-evolution/component-factory.c:45
 msgid "Folder containing the Evolution Summary"
 msgstr "Ordner mit der Evolution-�bersicht"
 
-#: my-evolution/component-factory.c:139
+#: my-evolution/component-factory.c:154
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr ""
 "Evolutions Chefsesselansichts-Komponente kann nicht initialisiert werden."
 
-#: my-evolution/e-summary-calendar.c:248 my-evolution/e-summary-calendar.c:266
+#: my-evolution/e-summary-calendar.c:263 my-evolution/e-summary-calendar.c:281
 msgid "Appointments"
 msgstr "Termine"
 
-#: my-evolution/e-summary-calendar.c:249
+#: my-evolution/e-summary-calendar.c:264
 msgid "No appointments"
 msgstr "Keine Termine"
 
-#: my-evolution/e-summary-calendar.c:286
+#: my-evolution/e-summary-calendar.c:301
 msgid "%k%M %d %B"
 msgstr "%k%M %d. %B"
 
-#: my-evolution/e-summary-calendar.c:288
+#: my-evolution/e-summary-calendar.c:303
 msgid "%l:%M %d %B"
 msgstr "%l.%M %d. %B"
 
-#: my-evolution/e-summary-mail.c:115
+#: my-evolution/e-summary-mail.c:130
 msgid "Mail summary"
 msgstr "Mail-Zusammenfassung"
 
@@ -9862,85 +9985,85 @@ msgstr "Mail-Zusammenfassung"
 #. see in My Evolution by default. You can find the list of all
 #. stations and their codes in Evolution sources
 #. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-preferences.c:65
-#: my-evolution/e-summary-weather.c:615
+#: my-evolution/e-summary-preferences.c:80
+#: my-evolution/e-summary-weather.c:630
 msgid "KBOS:ZSAM:EGAA"
 msgstr "EDDI:EDDH:EDDK:EDDM"
 
-#: my-evolution/e-summary-preferences.c:427
+#: my-evolution/e-summary-preferences.c:441
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com: Wort des Tages"
 
-#: my-evolution/e-summary-preferences.c:449
+#: my-evolution/e-summary-preferences.c:463
 msgid "Quotes of the Day"
 msgstr "Zitate des Tages"
 
-#: my-evolution/e-summary-preferences.c:890
+#: my-evolution/e-summary-preferences.c:929
 msgid "Add a news feed"
 msgstr "Einen Newsstrom hinzuf�gen"
 
-#: my-evolution/e-summary-preferences.c:898
+#: my-evolution/e-summary-preferences.c:937
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Geben Sie die Adresse des Newsstromes ein, den Sie hinzuf�gen wollen"
 
-#: my-evolution/e-summary-preferences.c:902
+#: my-evolution/e-summary-preferences.c:941
 msgid "Name:"
 msgstr "Name:"
 
-#: my-evolution/e-summary-preferences.c:1438
+#: my-evolution/e-summary-preferences.c:1486
 msgid "Summary Settings"
 msgstr "Einstellungen der Zusammenfassung"
 
-#: my-evolution/e-summary-rdf.c:277 my-evolution/e-summary-rdf.c:362
-#: my-evolution/e-summary-rdf.c:395
+#: my-evolution/e-summary-rdf.c:297 my-evolution/e-summary-rdf.c:382
+#: my-evolution/e-summary-rdf.c:415
 #, fuzzy
 msgid "Error downloading RDF"
 msgstr "<b>Fehler beim Herunterladen von RDF</b>"
 
-#: my-evolution/e-summary-rdf.c:487
+#: my-evolution/e-summary-rdf.c:507
 msgid "News Feed"
 msgstr "Nachrichtenkanal"
 
-#: my-evolution/e-summary-tasks.c:216
+#: my-evolution/e-summary-tasks.c:238
 msgid "No tasks"
 msgstr "Keine Aufgaben"
 
-#: my-evolution/e-summary-tasks.c:255
+#: my-evolution/e-summary-tasks.c:277
 #, fuzzy
 msgid "(No Description)"
 msgstr "Beschreibung:"
 
-#: my-evolution/e-summary-weather.c:57
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr "Mein Wetter"
 
-#: my-evolution/e-summary-weather.c:334
+#: my-evolution/e-summary-weather.c:349
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 "<dd><b>Es konnte keine Verbindung mit dem Wetterserver aufgenommen werden</"
 "b></dd>"
 
-#: my-evolution/e-summary-weather.c:524
+#: my-evolution/e-summary-weather.c:539
 msgid "Weather"
 msgstr "Wetter"
 
-#: my-evolution/e-summary-weather.c:676
+#: my-evolution/e-summary-weather.c:691
 msgid "Regions"
 msgstr "Regionen"
 
-#: my-evolution/e-summary.c:162
+#: my-evolution/e-summary.c:187
 msgid "%A, %B %e %Y"
 msgstr "%A, %e. %B %Y"
 
-#: my-evolution/e-summary.c:512 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:568 ui/my-evolution.xml.h:3
 msgid "Print Summary"
 msgstr "Zusammenfassung drucken"
 
-#: my-evolution/e-summary.c:558
+#: my-evolution/e-summary.c:614
 msgid "Printing of Summary failed"
 msgstr "Drucken der �bersicht fehlgeschlagen"
 
-#: my-evolution/main.c:52
+#: my-evolution/main.c:67
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Chefsesselansichts-Komponente konnte Bonobo nicht initialisieren.\n"
 
@@ -11349,38 +11472,38 @@ msgstr ""
 "es, damit Evolution seine Benutzerdateien\n"
 "installieren kann."
 
-#: shell/e-shell-folder-commands.c:174
+#: shell/e-shell-folder-commands.c:176
 msgid "Cannot move a folder over itself."
 msgstr "Ordner kann nicht in sich selbst verschoben werden."
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:178
 msgid "Cannot copy a folder over itself."
 msgstr "Ordner kann nicht in sich selbst kopiert werden."
 
-#: shell/e-shell-folder-commands.c:190
+#: shell/e-shell-folder-commands.c:192
 msgid "Cannot move a folder into one of its descendants."
 msgstr "Ein Ordner kann nicht in eines seiner Kinder verschoben werden."
 
-#: shell/e-shell-folder-commands.c:294
+#: shell/e-shell-folder-commands.c:312
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "Geben Sie einen Ordner an, in den Ordner \"%s\" kopiert werden soll:"
 
-#: shell/e-shell-folder-commands.c:299
+#: shell/e-shell-folder-commands.c:317
 msgid "Copy folder"
 msgstr "Ordner kopieren"
 
-#: shell/e-shell-folder-commands.c:337
+#: shell/e-shell-folder-commands.c:359
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 "Geben Sie einen Ordner an, in den Ordner \"%s\" verschoben werden soll:"
 
-#: shell/e-shell-folder-commands.c:342
+#: shell/e-shell-folder-commands.c:364
 msgid "Move folder"
 msgstr "Ordner verschieben"
 
-#: shell/e-shell-folder-commands.c:367
+#: shell/e-shell-folder-commands.c:390
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -11389,33 +11512,35 @@ msgstr ""
 "Ordner kann nicht gel�scht werden:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:383
-#, c-format
-msgid "Delete folder '%s'"
-msgstr "Ordner '%s' l�schen"
+#: shell/e-shell-folder-commands.c:406
+#, fuzzy, c-format
+msgid "Delete \"%s\""
+msgstr "L�schen"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:393
-#, c-format
-msgid "Are you sure you want to remove the '%s' folder?"
+#: shell/e-shell-folder-commands.c:416
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the \"%s\" folder?"
 msgstr "Sind Sie sicher, dass Sie den Ordner '%s' entfernen wollen?"
 
-#. Popup a dialog asking what the user would like to rename
-#. the folder to
-#: shell/e-shell-folder-commands.c:468
-#, c-format
-msgid "Rename folder '%s'"
-msgstr "Ordner '%s' umbenennen"
+#: shell/e-shell-folder-commands.c:470
+#, fuzzy, c-format
+msgid ""
+"Cannot rename folder:\n"
+"%s"
+msgstr ""
+"Ordner kann nicht gel�scht werden:\n"
+"%s"
 
-#: shell/e-shell-folder-commands.c:472
-msgid "Rename"
-msgstr "Umbenennen"
+#: shell/e-shell-folder-commands.c:503
+#, fuzzy, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "Ordner '%s' umbenennen"
 
-#. Make, pack the label
-#: shell/e-shell-folder-commands.c:480
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "Ordnername:"
+#: shell/e-shell-folder-commands.c:506
+#, fuzzy
+msgid "Rename folder"
+msgstr "Ordner '%s' umbenennen"
 
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
@@ -11451,7 +11576,7 @@ msgstr "Der angegebene Ordnername ist nicht g�ltig: %s"
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Neuen Ordner anlegen"
 
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:99
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -11459,7 +11584,7 @@ msgstr ""
 "Der Typ des ausgew�hlten Ordners ist f�r die \n"
 "gew�hlte Operation nicht g�ltig."
 
-#: shell/e-shell-folder-selection-dialog.c:348
+#: shell/e-shell-folder-selection-dialog.c:360
 msgid "New..."
 msgstr "Neu..."
 
@@ -11467,7 +11592,11 @@ msgstr "Neu..."
 msgid "(Untitled)"
 msgstr "(Namenlos)"
 
-#: shell/e-shell-importer.c:102
+#: shell/e-shell-importer.c:141
+msgid "Choose the type of importer to run"
+msgstr ""
+
+#: shell/e-shell-importer.c:144
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -11481,9 +11610,16 @@ 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:150
+#, fuzzy
+msgid "Please select the information that you would like to import"
+msgstr ""
+"Bitte w�hlen Sie die Informationen,\n"
+"die Sie importieren wollen"
+
 #. Importer isn't ready yet.
 #. Wait 5 seconds and try again.
-#: shell/e-shell-importer.c:197
+#: shell/e-shell-importer.c:242
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11494,7 +11630,7 @@ msgstr ""
 "Importeur nicht bereit.\n"
 "Es wird 5 Sekunden bis zum n�chsten Versuch gewartet"
 
-#: shell/e-shell-importer.c:217 shell/e-shell-importer.c:248
+#: shell/e-shell-importer.c:262 shell/e-shell-importer.c:293
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11503,16 +11639,16 @@ msgstr ""
 "Importieren von %s\n"
 "Importiert wird Objekt %d."
 
-#: shell/e-shell-importer.c:351
+#: shell/e-shell-importer.c:396
 #, c-format
 msgid "File %s does not exist"
 msgstr "Datei %s existiert nicht"
 
-#: shell/e-shell-importer.c:363
+#: shell/e-shell-importer.c:408
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:378
+#: shell/e-shell-importer.c:423
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -11522,11 +11658,11 @@ msgstr ""
 "%s\n"
 "umgehen kann"
 
-#: shell/e-shell-importer.c:388
+#: shell/e-shell-importer.c:433
 msgid "Importing"
 msgstr "Importieren"
 
-#: shell/e-shell-importer.c:396
+#: shell/e-shell-importer.c:441
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -11535,17 +11671,17 @@ msgstr ""
 "Importieren von %s.\n"
 "Starten von %s"
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:454
 #, c-format
 msgid "Error starting %s"
 msgstr "Fehler beim Starten von %s"
 
-#: shell/e-shell-importer.c:428
+#: shell/e-shell-importer.c:473
 #, c-format
 msgid "Error loading %s"
 msgstr "Fehler beim Laden von %s"
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:490
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11554,31 +11690,57 @@ msgstr ""
 "Importieren von %s.\n"
 "Erstes Objekt wird importiert."
 
-#: shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:560
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: shell/e-shell-importer.c:566
+#: shell/e-shell-importer.c:611
 msgid "Filename:"
 msgstr "Dateiname:"
 
-#: shell/e-shell-importer.c:571
+#: shell/e-shell-importer.c:616
 msgid "Select a file"
 msgstr "Eine Datei w�hlen"
 
-#: shell/e-shell-importer.c:581
+#: shell/e-shell-importer.c:626
 msgid "File type:"
 msgstr "Dateityp:"
 
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:651
+msgid "Import data and settings from older programs"
+msgstr ""
+
+#: shell/e-shell-importer.c:655
+#, fuzzy
+msgid "Import a single file"
+msgstr "Ein externes Dateiformat importieren"
+
+#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:582
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+"Bitte warten...\n"
+"Suche nach existierenden Einstellungen"
+
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:585
+msgid "Starting Intelligent Importers"
+msgstr "Intelligente Importeure werden gestartet"
+
+#: shell/e-shell-importer.c:840 shell/e-shell-startup-wizard.c:703
+#, c-format
+msgid "From %s:"
+msgstr "Von %s:"
+
+#: shell/e-shell-importer.c:1003
 msgid "Select folder"
 msgstr "Ordner w�hlen"
 
-#: shell/e-shell-importer.c:646
+#: shell/e-shell-importer.c:1004
 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:689 shell/importer/intelligent.c:194
+#: shell/e-shell-importer.c:1116 shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "Importieren"
 
@@ -11599,23 +11761,6 @@ msgstr ""
 msgid "Cannot initialize the Evolution Mailer Wizard interface"
 msgstr "Evolution-Mailerdruiden-Interface kann nicht initialisiert werden"
 
-#: shell/e-shell-startup-wizard.c:582
-msgid ""
-"Please wait...\n"
-"Scanning for existing setups"
-msgstr ""
-"Bitte warten...\n"
-"Suche nach existierenden Einstellungen"
-
-#: shell/e-shell-startup-wizard.c:585
-msgid "Starting Intelligent Importers"
-msgstr "Intelligente Importeure werden gestartet"
-
-#: shell/e-shell-startup-wizard.c:703
-#, c-format
-msgid "From %s:"
-msgstr "Von %s:"
-
 #: shell/e-shell-startup-wizard.c:745
 msgid ""
 "Please select the information\n"
@@ -11624,23 +11769,23 @@ msgstr ""
 "Bitte w�hlen Sie die Informationen,\n"
 "die Sie importieren wollen"
 
-#: shell/e-shell-view-menu.c:183
+#: shell/e-shell-view-menu.c:201
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Der Fehlermelder kann nicht gefunden werden"
 
-#: shell/e-shell-view-menu.c:191
+#: shell/e-shell-view-menu.c:209
 msgid "Bug buddy could not be run."
 msgstr "Der Fehlermelder kann nicht starten"
 
-#: shell/e-shell-view-menu.c:217
+#: shell/e-shell-view-menu.c:235
 msgid "Ximian Evolution"
 msgstr "Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:219
+#: shell/e-shell-view-menu.c:237
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:221
+#: shell/e-shell-view-menu.c:239
 msgid ""
 "Ximian Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -11650,27 +11795,36 @@ msgstr ""
 "f�r Mail sowie Termin- und Kontaktverwaltung in der\n"
 "GNOME-Desktopumgebung."
 
-#: shell/e-shell-view-menu.c:424
+#: shell/e-shell-view-menu.c:442
 msgid "Go to folder..."
 msgstr "Gehe zu Ordner..."
 
-#: shell/e-shell-view-menu.c:425
+#: shell/e-shell-view-menu.c:443
 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:570
+#: shell/e-shell-view-menu.c:563
 msgid "Create a new shortcut"
 msgstr "Eine neue Verkn�pfung anlegen"
 
-#: shell/e-shell-view-menu.c:571
+#: shell/e-shell-view-menu.c:564
 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:685
+#: shell/e-shell-view-menu.c:595
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:603
+#, fuzzy, c-format
+msgid "Error executing %s."
+msgstr "Fehler beim Ausf�hren des Filters: %s: %s"
+
+#: shell/e-shell-view-menu.c:705
 msgid "Work Online"
 msgstr "Online arbeiten"
 
-#: shell/e-shell-view-menu.c:698 shell/e-shell-view-menu.c:711
+#: shell/e-shell-view-menu.c:718 shell/e-shell-view-menu.c:731
 #: ui/evolution.xml.h:30
 msgid "Work Offline"
 msgstr "Offline arbeiten"
@@ -11679,49 +11833,49 @@ msgstr "Offline arbeiten"
 msgid "(No folder displayed)"
 msgstr "(Kein Ordner angezeigt)"
 
-#: shell/e-shell-view.c:1478
+#: shell/e-shell-view.c:1512
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1480
+#: shell/e-shell-view.c:1514
 msgid "(None)"
 msgstr "(keine)"
 
-#: shell/e-shell-view.c:1485
+#: shell/e-shell-view.c:1519
 #, c-format
 msgid "%s - Ximian Evolution %s"
 msgstr "%s - Ximian Evolution %s"
 
-#: shell/e-shell-view.c:1487
+#: shell/e-shell-view.c:1521
 #, c-format
 msgid "%s - Ximian Evolution %s [%s]"
 msgstr "%s - Ximian Evolution %s [%s]"
 
-#: shell/e-shell-view.c:1527
+#: shell/e-shell-view.c:1561
 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:1534
+#: shell/e-shell-view.c:1568
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution geht gerade offline."
 
-#: shell/e-shell-view.c:1540
+#: shell/e-shell-view.c:1574
 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:560
+#: shell/e-shell.c:562
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Lokaler Speicher kann nicht eingestellt werden -- %s"
 
-#: shell/e-shell.c:1496
+#: shell/e-shell.c:1488
 #, c-format
 msgid ""
 "Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
@@ -11730,23 +11884,23 @@ msgstr ""
 "Hoppla! Die Ansichten f�r `%s' sind unerwartet gestorben.  :-(\n"
 "Das hei�t wahrscheinlich, dass die %s-Komponente abgest�rzt ist."
 
-#: shell/e-shell.c:1700 widgets/misc/e-cell-date-edit.c:248
+#: shell/e-shell.c:1692 widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "OK"
 
-#: shell/e-shell.c:1702
+#: shell/e-shell.c:1694
 msgid "Invalid arguments"
 msgstr "Ung�ltige Argumente"
 
-#: shell/e-shell.c:1704
+#: shell/e-shell.c:1696
 msgid "Cannot register on OAF"
 msgstr "Registrierung bei OAF kann nicht stattfinden"
 
-#: shell/e-shell.c:1706
+#: shell/e-shell.c:1698
 msgid "Configuration Database not found"
 msgstr "Konfigurationsdatenbank nicht gefunden"
 
-#: shell/e-shell.c:1708 shell/e-storage.c:491
+#: shell/e-shell.c:1700 shell/e-storage.c:496
 msgid "Generic error"
 msgstr "Allgemeiner Fehler"
 
@@ -11872,51 +12026,60 @@ msgstr "Fehler beim Speichern von Verkn�pfungen."
 msgid "Shortcuts"
 msgstr "Verkn�pfungen"
 
+#: shell/e-storage-set-view.c:645
+#, fuzzy, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr ""
+"Ordner kann nicht gel�scht werden:\n"
+"%s"
+
 #: shell/e-storage.c:182 shell/e-storage.c:188
 msgid "(No name)"
 msgstr "(Kein Name)"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:494
 msgid "No error"
 msgstr "Kein Fehler"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:498
 msgid "A folder with the same name already exists"
 msgstr "Ein Ordner mit dem gleichen Namen existiert bereits"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:500
 msgid "The specified folder type is not valid"
 msgstr "Der angegebene Ordnertyp ist ung�ltig"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:502
 msgid "I/O error"
 msgstr "E-/A-Fehler"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:504
 msgid "Not enough space to create the folder"
 msgstr "Nicht gen�gend Platz, um den Ordner zu erstellen"
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:506
 msgid "The specified folder was not found"
 msgstr "Der angegebene Ordner wurde nicht gefunden"
 
-#: shell/e-storage.c:503
+#: shell/e-storage.c:508
 msgid "Function not implemented in this storage"
 msgstr "Funktion f�r diese Speicherweise nicht implementiert"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:512
 msgid "Operation not supported"
 msgstr "Operation nicht unterst�tzt"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:514
 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:511
+#: shell/e-storage.c:516
 msgid "The specified folder cannot be modified or removed"
 msgstr "Der angegebene Ordner kann nicht ge�ndert oder entfernt werden"
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:518
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Ein Ordner kann nicht das Kinder eines seiner Nachkommen werden"
 
@@ -11947,6 +12110,10 @@ msgstr "Rechner"
 msgid "The following connections are currently active:"
 msgstr "Die folgenden Verbindungen sind zur Zeit aktiv:"
 
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr "Ordnername:"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder type:"
 msgstr "Ordnertyp:"
@@ -12000,14 +12167,26 @@ msgid "Evolution Importer Assistant"
 msgstr "Evolution-Importeur-Druide"
 
 #: shell/importer/import.glade.h:4
-msgid "Import File (Step 2 of 2)"
+#, fuzzy
+msgid "Import File (step 3 of 3)"
 msgstr "Datei importieren (Schritt 2 von 2)"
 
 #: shell/importer/import.glade.h:5
-msgid "Select a File (step 1 of 2)"
-msgstr "Eine Datei w�hlen (Schritt 1 von 2)"
+#, fuzzy
+msgid "Importer Type (step 1 of 3)"
+msgstr "Datei importieren (Schritt 2 von 2)"
 
 #: shell/importer/import.glade.h:6
+#, fuzzy
+msgid "Select Importers (step 2 of 3)"
+msgstr "Eine Datei w�hlen (Schritt 1 von 2)"
+
+#: shell/importer/import.glade.h:7
+#, fuzzy
+msgid "Select a File (step 2 of 3)"
+msgstr "Eine Datei w�hlen (Schritt 1 von 2)"
+
+#: shell/importer/import.glade.h:8
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of\n"
@@ -12224,13 +12403,6 @@ msgstr "Nach Kontakten _suchen"
 msgid "_Select All"
 msgstr "Alle ausw�hlen"
 
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:44
-#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
-#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:19
-#: ui/my-evolution.xml.h:9
-msgid "_Tools"
-msgstr "Werkzeuge"
-
 #: ui/evolution-calendar.xml.h:2
 msgid "Configure the calendar's settings"
 msgstr "Einstellungen des Kalenders konfigurieren"
@@ -12401,8 +12573,8 @@ 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:49
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:36
 msgid "_File"
 msgstr "_Datei"
@@ -12423,8 +12595,8 @@ msgstr "Den Kontakt speichern und das Dialogfenster schlie�en"
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:54
-#: ui/evolution-signature-editor.xml.h:11
+#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Save"
 msgstr "_Speichern"
 
@@ -13018,6 +13190,11 @@ msgstr "_Normale Anzeige"
 msgid "_Open Message"
 msgstr "Nachricht _�ffnen"
 
+#: ui/evolution-mail-message.xml.h:98 ui/evolution.xml.h:49
+#: ui/my-evolution.xml.h:9
+msgid "_Tools"
+msgstr "Werkzeuge"
+
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Dieses Fenster schlie�en"
@@ -13029,8 +13206,8 @@ msgstr "Dieses Fenster schlie�en"
 msgid "_Close"
 msgstr "Schlie�en"
 
-#: ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:48
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:50
 msgid "_View"
 msgstr "_Ansicht"
 
@@ -13193,36 +13370,31 @@ msgid "_Cc Field"
 msgstr "_CC-Feld"
 
 #: ui/evolution-message-composer.xml.h:46
-#: ui/evolution-signature-editor.xml.h:6
-msgid "_Debug"
-msgstr "_Diagnose"
-
-#: ui/evolution-message-composer.xml.h:47
 msgid "_Delete all"
 msgstr "Alle _l�schen"
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:49
 msgid "_From Field"
 msgstr "_Von-Feld"
 
-#: ui/evolution-message-composer.xml.h:51
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-signature-editor.xml.h:9
 msgid "_Insert"
 msgstr "Einf�gen"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:51
 msgid "_Open..."
 msgstr "_�ffnen..."
 
-#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Reply-To Field"
 msgstr "Antwort-an-Feld"
 
-#: ui/evolution-message-composer.xml.h:55
+#: ui/evolution-message-composer.xml.h:54
 msgid "_Security"
 msgstr "_Sicherheit"
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "_Hilfe"
 
@@ -13355,8 +13527,8 @@ msgid "Exit the program"
 msgstr "Das Programm verlassen"
 
 #: ui/evolution.xml.h:15
-msgid "Import an external file format"
-msgstr "Ein externes Dateiformat importieren"
+msgid "Import data from other programs"
+msgstr ""
 
 #: ui/evolution.xml.h:17
 msgid "Move this folder to another place"
@@ -13427,8 +13599,9 @@ msgid "_Go to Folder..."
 msgstr "_Gehe zu Ordner..."
 
 #: ui/evolution.xml.h:41
-msgid "_Import File..."
-msgstr "Datei _importieren..."
+#, fuzzy
+msgid "_Import..."
+msgstr "Importieren..."
 
 #: ui/evolution.xml.h:42
 msgid "_Move..."
@@ -13443,18 +13616,23 @@ msgid "_New Folder"
 msgstr "Neuer Ordner"
 
 #: ui/evolution.xml.h:45
+#, fuzzy
+msgid "_Pilot Settings..."
+msgstr "_Mail-Einstellungen..."
+
+#: ui/evolution.xml.h:46
 msgid "_Rename..."
 msgstr "_Umbenennen..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:47
 msgid "_Shortcut"
 msgstr "_Verkn�pfung"
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:48
 msgid "_Shortcut Bar"
 msgstr "Verkn�pfungsleiste"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:51
 msgid "_Work Offline"
 msgstr "Offline _arbeiten"
 
@@ -13551,11 +13729,11 @@ msgstr "MDMDFSS"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:433
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:439
 msgid "Now"
 msgstr "Jetzt"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:445
 msgid "Today"
 msgstr "Heute"
 
@@ -13698,21 +13876,62 @@ msgstr "Der pers�nliche Adressbuchserver"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "Der pers�nliche Kalenderserver; Kalender-Factory"
 
-#: wombat/wombat.c:175
+#: wombat/wombat.c:176
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): GNOME VFS konnte nicht initialisiert werden"
 
-#: wombat/wombat.c:187
+#: wombat/wombat.c:188
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init-corba(): GNOME konnte nicht initialisiert werden"
 
-#: wombat/wombat.c:200
+#: wombat/wombat.c:201
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo konnte nicht initialisiert werden"
 
 #, fuzzy
-#~ msgid "Cannot open folder: %s: No such folder"
-#~ msgstr "Ordner kann nicht abgerufen werden: %s: %s"
+#~ msgid "_Calendar Information:"
+#~ msgstr "Kalender-Information"
+
+#~ msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
+#~ msgstr ""
+#~ "Die Priorit�t muss 'Hoch', 'Normal', 'Niedrig' oder 'Undefiniert' sein."
+
+#~ msgid "before start of appointment"
+#~ msgstr "vor Terminbeginn"
+
+#~ msgid "after start of appointment"
+#~ msgstr "nach Terminbeginn"
+
+#~ msgid "before end of appointment"
+#~ msgstr "vor Terminende"
+
+#, fuzzy
+#~ msgid "Evolution Shortcuts"
+#~ msgstr "Evolution"
+
+#~ msgid "Each account must have a different name."
+#~ msgstr "Alle Zug�nge brauchen unterschiedliche Namen."
+
+#~ msgid "Message _preview should be displayed by default"
+#~ msgstr "Nachrichten_vorschau sollte per Vorgabe angezeigt werden"
+
+#~ msgid "Message list should display in a _threaded fashion by default"
+#~ msgstr "Nachrichtenliste sollte per Vorgabe zu _Threads geordnet sein"
+
+#~ msgid "_Remember PGP Passphrase until exit"
+#~ msgstr "_PGP-Passphrase bis zum Beenden behalten"
+
+#~ msgid "Delete folder '%s'"
+#~ msgstr "Ordner '%s' l�schen"
+
+#~ msgid "Rename"
+#~ msgstr "Umbenennen"
+
+#~ msgid "_Debug"
+#~ msgstr "_Diagnose"
+
+#~ msgid "_Import File..."
+#~ msgstr "Datei _importieren..."
 
 #~ msgid "Unable to get local storage.  This should never happen."
 #~ msgstr ""
diff --git a/po/el.po b/po/el.po
index 31f445a670..90acbc1fb2 100644
--- a/po/el.po
+++ b/po/el.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.1\n"
-"POT-Creation-Date: 2001-09-21 18:31-0400\n"
+"POT-Creation-Date: 2001-10-01 19:06-0400\n"
 "PO-Revision-Date: 2000-04-04 19:42-0500\n"
 "Last-Translator: Spiros Papadimitriou <spapadim+@cs.cmu.edu>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -33,297 +33,297 @@ msgid "Name"
 msgstr "����������� ������"
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#, fuzzy
-msgid "Family Name"
-msgstr "����������� ������"
-
-#: addressbook/backend/ebook/e-card-simple.c:61
 #: addressbook/gui/widgets/e-addressbook-view.c:870
 #, fuzzy
 msgid "Email"
 msgstr "_������"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:61
 #: addressbook/gui/contact-editor/e-contact-editor.c:1609
 #, fuzzy
 msgid "Primary"
 msgstr "�������������"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:61
 #, fuzzy
 msgid "Prim"
 msgstr "�������������"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:92
 #: addressbook/gui/contact-editor/e-contact-editor.c:1594
 #: addressbook/gui/widgets/e-addressbook-view.c:902
 msgid "Assistant"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/gui/contact-editor/e-contact-editor.c:1595
 #: addressbook/gui/contact-editor/e-contact-editor.c:1662
 msgid "Business"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/backend/ebook/e-card-simple.c:68
 #, fuzzy
 msgid "Bus"
 msgstr "����������"
 
-#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/gui/contact-editor/e-contact-editor.c:1598
 msgid "Callback"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/gui/contact-editor/e-contact-editor.c:1600
 #, fuzzy
 msgid "Company"
 msgstr "���������"
 
-#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:65
 #, fuzzy
 msgid "Comp"
 msgstr "���������"
 
-#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:69
 #: addressbook/gui/contact-editor/e-contact-editor.c:1601
 #: addressbook/gui/contact-editor/e-contact-editor.c:1663
 #, fuzzy
 msgid "Home"
 msgstr "������_��"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:67
 #: addressbook/gui/widgets/e-addressbook-view.c:877
 msgid "Organization"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:67
 msgid "Org"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/e-contact-editor.c:1605
 #, fuzzy
 msgid "Mobile"
 msgstr "_������"
 
-#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/e-contact-editor.c:1599
 msgid "Car"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/e-contact-editor.c:1597
 #: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "Business Fax"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/backend/ebook/e-card-simple.c:72
 msgid "Bus Fax"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/backend/ebook/e-card-simple.c:73
 #: addressbook/gui/contact-editor/e-contact-editor.c:1603
 #: addressbook/gui/widgets/e-addressbook-view.c:883
 #, fuzzy
 msgid "Home Fax"
 msgstr "������_��"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/e-contact-editor.c:1596
 msgid "Business 2"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/backend/ebook/e-card-simple.c:74
 msgid "Bus 2"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/backend/ebook/e-card-simple.c:75
 #: addressbook/gui/contact-editor/e-contact-editor.c:1602
 #, fuzzy
 msgid "Home 2"
 msgstr "������_��"
 
-#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/backend/ebook/e-card-simple.c:76
 #: addressbook/gui/contact-editor/e-contact-editor.c:1604
 #: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "ISDN"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/backend/ebook/e-card-simple.c:83
 #: addressbook/gui/contact-editor/e-contact-editor.c:1606
 #: addressbook/gui/contact-editor/e-contact-editor.c:1664
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:52
 msgid "Other"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/backend/ebook/e-card-simple.c:78
 #: addressbook/gui/contact-editor/e-contact-editor.c:1607
 #: addressbook/gui/widgets/e-addressbook-view.c:888
 msgid "Other Fax"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/gui/contact-editor/e-contact-editor.c:1608
 #: addressbook/gui/widgets/e-addressbook-view.c:889
 #, fuzzy
 msgid "Pager"
 msgstr "����������"
 
-#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/backend/ebook/e-card-simple.c:80
 #: addressbook/gui/contact-editor/e-contact-editor.c:1610
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 msgid "Radio"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/backend/ebook/e-card-simple.c:81
 #: addressbook/gui/contact-editor/e-contact-editor.c:1611
 #: addressbook/gui/widgets/e-addressbook-view.c:891
 msgid "Telex"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/backend/ebook/e-card-simple.c:82
 #: addressbook/gui/widgets/e-addressbook-view.c:892
 msgid "TTY"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/backend/ebook/e-card-simple.c:84
 #: addressbook/gui/component/e-address-popup.c:476
 #: addressbook/gui/contact-editor/e-contact-editor.c:1637
 #: addressbook/gui/widgets/e-addressbook-view.c:894
 msgid "Email 2"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/backend/ebook/e-card-simple.c:85
 #: addressbook/gui/component/e-address-popup.c:486
 #: addressbook/gui/contact-editor/e-contact-editor.c:1638
 #: addressbook/gui/widgets/e-addressbook-view.c:895
 msgid "Email 3"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/widgets/e-addressbook-view.c:896
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:86
 msgid "Url"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/widgets/e-addressbook-view.c:897
 #, fuzzy
 msgid "Department"
 msgstr "����������"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:87
 msgid "Dep"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/backend/ebook/e-card-simple.c:88
 #: addressbook/gui/widgets/e-addressbook-view.c:898
 msgid "Office"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/backend/ebook/e-card-simple.c:88
 msgid "Off"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card-simple.c:89
 #: addressbook/gui/widgets/e-addressbook-view.c:899
 #, fuzzy
 msgid "Title"
 msgstr "_��������"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:90
 #: addressbook/gui/widgets/e-addressbook-view.c:900
 #, fuzzy
 msgid "Profession"
 msgstr "�_��������"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Prof"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:91
 #: addressbook/gui/widgets/e-addressbook-view.c:901
 #, fuzzy
 msgid "Manager"
 msgstr "����������"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:91
 #, fuzzy
 msgid "Man"
 msgstr "������"
 
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:92
 msgid "Ass"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card-simple.c:93
 #: addressbook/gui/widgets/e-addressbook-view.c:903
 msgid "Nickname"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card-simple.c:93
 msgid "Nick"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/backend/ebook/e-card-simple.c:94
 #: addressbook/gui/widgets/e-addressbook-view.c:904
 #, fuzzy
 msgid "Spouse"
 msgstr "��� ����������"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card-simple.c:95
 #: addressbook/gui/widgets/e-addressbook-view.c:905
 #, fuzzy
 msgid "Note"
 msgstr "������_��"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:96
 #, fuzzy
 msgid "Calendar URI"
 msgstr "����������"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:96
 msgid "CALUri"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:97
 #: addressbook/gui/widgets/e-addressbook-view.c:906
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:97
 msgid "FBUrl"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "Anniversary"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "Anniv"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card-simple.c:99
 #, fuzzy
 msgid "Birth Date"
 msgstr "��_���� ����������"
 
-#: addressbook/backend/ebook/e-card-simple.c:103
+#: addressbook/backend/ebook/e-card-simple.c:102
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr ""
 
+#: addressbook/backend/ebook/e-card-simple.c:103
+#, fuzzy
+msgid "Family Name"
+msgstr "����������� ������"
+
 #: addressbook/backend/ebook/e-card.c:3564
 msgid "Card: "
 msgstr ""
@@ -556,10 +556,10 @@ msgstr ""
 #: 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:1119
+#: addressbook/conduit/address-conduit.c:1167
 #: addressbook/gui/component/addressbook-factory.c:48
-#: calendar/conduits/calendar/calendar-conduit.c:1204
-#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/conduits/calendar/calendar-conduit.c:1262
+#: calendar/conduits/todo/todo-conduit.c:1034
 #: calendar/gui/alarm-notify/notify-main.c:78 calendar/gui/main.c:63
 #, fuzzy
 msgid "Could not initialize Bonobo"
@@ -624,21 +624,21 @@ msgstr ""
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:681
-#: calendar/conduits/calendar/calendar-conduit.c:778
-#: calendar/conduits/todo/todo-conduit.c:592
+#: addressbook/conduit/address-conduit.c:731
+#: calendar/conduits/calendar/calendar-conduit.c:837
+#: calendar/conduits/todo/todo-conduit.c:609
 msgid "Could not start wombat server"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:682
-#: calendar/conduits/calendar/calendar-conduit.c:779
-#: calendar/conduits/todo/todo-conduit.c:593
+#: addressbook/conduit/address-conduit.c:732
+#: calendar/conduits/calendar/calendar-conduit.c:838
+#: calendar/conduits/todo/todo-conduit.c:610
 #, fuzzy
 msgid "Could not start wombat"
 msgstr "������ ���/�����: ������������ ��� Bonobo �������"
 
-#: addressbook/conduit/address-conduit.c:714
-#: addressbook/conduit/address-conduit.c:717
+#: addressbook/conduit/address-conduit.c:762
+#: addressbook/conduit/address-conduit.c:765
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -687,8 +687,8 @@ msgid "Factory for the sample Addressbook control"
 msgstr "���� ��� ��� �� ���������������"
 
 #: addressbook/gui/component/addressbook-component.c:66
-#: calendar/gui/dialogs/comp-editor-util.c:281
-#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:173
+#: calendar/gui/dialogs/comp-editor-util.c:289
+#: calendar/gui/dialogs/comp-editor-util.c:345 shell/e-local-storage.c:173
 #: shell/e-shortcuts.c:1062
 #, fuzzy
 msgid "Contacts"
@@ -709,23 +709,23 @@ msgstr "��� �����"
 msgid "LDAP server containing contact information"
 msgstr "�������� ��� �������� �������� �����������"
 
-#: addressbook/gui/component/addressbook-component.c:386
+#: addressbook/gui/component/addressbook-component.c:411
 #: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "New Contact"
 msgstr "_��������"
 
-#: addressbook/gui/component/addressbook-component.c:386
+#: addressbook/gui/component/addressbook-component.c:411
 #, fuzzy
 msgid "New _Contact"
 msgstr "_��������"
 
-#: addressbook/gui/component/addressbook-component.c:387
+#: addressbook/gui/component/addressbook-component.c:412
 #, fuzzy
 msgid "New Contact List"
 msgstr "_��������"
 
-#: addressbook/gui/component/addressbook-component.c:387
+#: addressbook/gui/component/addressbook-component.c:412
 #, fuzzy
 msgid "New Contact _List"
 msgstr "_��������"
@@ -838,19 +838,19 @@ msgid "_Account name:"
 msgstr "����� ���������"
 
 #: addressbook/gui/component/addressbook-config.glade.h:22
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: 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:90 my-evolution/my-evolution.glade.h:20
+#: mail/mail-config.glade.h:91 my-evolution/my-evolution.glade.h:20
 msgid "_Add"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.glade.h:23
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:95
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:96
 #: ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
 #: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
 msgstr ""
@@ -874,38 +874,38 @@ msgstr "����������� ��������"
 msgid "Other Contacts"
 msgstr "������ ������������"
 
-#: addressbook/gui/component/addressbook.c:393
+#: addressbook/gui/component/addressbook.c:407
 #, c-format
 msgid "Please enter your email address and password for access to %s"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:401
+#: addressbook/gui/component/addressbook.c:415
 msgid "LDAP Authentication"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:412
+#: addressbook/gui/component/addressbook.c:426
 #, fuzzy
 msgid "Email Address:"
 msgstr "���� ��� ��� �� ���������������"
 
-#: addressbook/gui/component/addressbook.c:425
+#: addressbook/gui/component/addressbook.c:439
 #, fuzzy
 msgid "Password:"
 msgstr "����������"
 
-#: addressbook/gui/component/addressbook.c:488
+#: addressbook/gui/component/addressbook.c:502
 #, fuzzy
 msgid "Unable to open addressbook"
 msgstr "���� ��� ��� �� ���������������"
 
-#: addressbook/gui/component/addressbook.c:495
+#: addressbook/gui/component/addressbook.c:509
 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:500
+#: addressbook/gui/component/addressbook.c:514
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -913,48 +913,48 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:508
+#: addressbook/gui/component/addressbook.c:522
 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:649
+#: addressbook/gui/component/addressbook.c:663
 #: calendar/gui/cal-search-bar.c:55
 #, fuzzy
 msgid "Any field contains"
 msgstr "������� ��� �������� ������������"
 
-#: addressbook/gui/component/addressbook.c:650
+#: addressbook/gui/component/addressbook.c:664
 msgid "Name contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:665
 #, fuzzy
 msgid "Email contains"
 msgstr "����� ���������"
 
-#: addressbook/gui/component/addressbook.c:652
+#: addressbook/gui/component/addressbook.c:666
 #: calendar/gui/cal-search-bar.c:59
 #, fuzzy
 msgid "Category is"
 msgstr "����� ���������"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:653 widgets/misc/e-filter-bar.h:97
+#: addressbook/gui/component/addressbook.c:667 widgets/misc/e-filter-bar.h:97
 #: widgets/misc/e-filter-bar.h:104
 #, fuzzy
 msgid "Advanced..."
 msgstr "��������� ��� �������������"
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:883
+#: addressbook/gui/component/addressbook.c:897
 #: calendar/gui/cal-search-bar.c:412
 #, fuzzy
 msgid "Any Category"
 msgstr "�������������"
 
-#: addressbook/gui/component/addressbook.c:925
+#: addressbook/gui/component/addressbook.c:939
 msgid "The URI that the Folder Browser will display"
 msgstr "�� URI ��� �� ��������� � ����������� ��������"
 
@@ -969,7 +969,7 @@ msgid "(none)"
 msgstr "������_��"
 
 #: addressbook/gui/component/e-address-popup.c:466
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #: addressbook/gui/contact-editor/e-contact-editor.c:1636
 msgid "Primary Email"
 msgstr ""
@@ -1152,125 +1152,131 @@ msgid "Details"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
+msgid "F_ree/Busy URL:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 #, fuzzy
 msgid "File A_s:"
 msgstr "_��������"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "General"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+msgid ""
+"If this person publishes free/busy or other calendar information on the "
+"Internet, enter the address\n"
+"of that information here."
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "New phone type"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 #, fuzzy
 msgid "No_tes:"
 msgstr "������_��"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Organi_zation:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "Phone Types"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "Wants to receive _HTML mail"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Address..."
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "_Assistant's name:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Birthday:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Business"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#, fuzzy
-msgid "_Calendar Information:"
-msgstr "�_����� ������������ ��� Evolution"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 #: calendar/gui/dialogs/event-page.glade.h:12
 #: calendar/gui/dialogs/task-page.glade.h:10
 #, fuzzy
 msgid "_Contacts..."
 msgstr "_��������"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:834 filter/filter.glade.h:8
-#: mail/folder-browser.c:1371 mail/mail-config.glade.h:94
+#: mail/folder-browser.c:1406 mail/mail-config.glade.h:95
 #: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Department:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#, fuzzy
-msgid "_Free/Busy Information:"
-msgstr "���������"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Full Name..."
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #, fuzzy
 msgid "_Home"
 msgstr "������_��"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #, fuzzy
 msgid "_Job title:"
 msgstr "_������"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Manager's Name:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #, fuzzy
 msgid "_Mobile"
 msgstr "_������"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Nickname:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Office:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Profession:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#, fuzzy
+msgid "_Public Calendar URL:"
+msgstr "����������"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Spouse:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_This is the mailing address"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Web page address:"
 msgstr ""
 
@@ -2518,7 +2524,7 @@ msgstr "��������"
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
 #: addressbook/gui/widgets/e-addressbook-view.c:691
 #: addressbook/gui/widgets/e-addressbook-view.c:753
-#: addressbook/gui/widgets/e-addressbook-view.c:1373
+#: addressbook/gui/widgets/e-addressbook-view.c:1422
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr ""
@@ -2579,8 +2585,8 @@ msgid "Success"
 msgstr "��� ����������"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1710
-#: shell/e-storage.c:515
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1702
+#: shell/e-storage.c:520
 msgid "Unknown error"
 msgstr ""
 
@@ -2588,7 +2594,7 @@ msgstr ""
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:505
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:510
 msgid "Permission denied"
 msgstr ""
 
@@ -2606,10 +2612,10 @@ msgid "Protocol not supported"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:733 calendar/gui/calendar-model.c:1274
+#: calendar/gui/calendar-model.c:726 calendar/gui/calendar-model.c:1247
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:544
-#: camel/camel-service.c:580
+#: calendar/gui/e-calendar-table.c:461 camel/camel-service.c:598
+#: camel/camel-service.c:634
 msgid "Cancelled"
 msgstr ""
 
@@ -2639,7 +2645,7 @@ msgid "Error removing list"
 msgstr "�������� �������� ���������"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1248
+#: addressbook/gui/widgets/e-addressbook-view.c:1297
 #, fuzzy
 msgid "Error removing card"
 msgstr "�������� �������� ���������"
@@ -2938,8 +2944,8 @@ msgstr "�������������"
 msgid "Print cards"
 msgstr "����������"
 
-#: addressbook/printing/e-contact-print.c:1112
-#: addressbook/printing/e-contact-print.c:1134
+#: addressbook/printing/e-contact-print.c:1152
+#: addressbook/printing/e-contact-print.c:1174
 #, fuzzy
 msgid "Print card"
 msgstr "����������"
@@ -2950,18 +2956,46 @@ msgstr "����������"
 msgid "Print envelope"
 msgstr "�������������"
 
-#: calendar/conduits/calendar/calendar-conduit.c:735
-#: calendar/conduits/todo/todo-conduit.c:548
+#: calendar/cal-util/cal-util.c:418 calendar/cal-util/cal-util.c:440
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:385 mail/message-list.c:652
+msgid "High"
+msgstr ""
+
+#: calendar/cal-util/cal-util.c:420 calendar/cal-util/cal-util.c:442
+#: calendar/gui/calendar-model.c:1673
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:386 mail/message-list.c:651
+#, fuzzy
+msgid "Normal"
+msgstr "���"
+
+#: calendar/cal-util/cal-util.c:422 calendar/cal-util/cal-util.c:444
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:387 mail/message-list.c:650
+#, fuzzy
+msgid "Low"
+msgstr "_���"
+
+#. An empty string is the same as 'None'.
+#: calendar/cal-util/cal-util.c:438
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:388
+msgid "Undefined"
+msgstr ""
+
+#: calendar/conduits/calendar/calendar-conduit.c:793
+#: calendar/conduits/todo/todo-conduit.c:564
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:839
-#: calendar/conduits/calendar/calendar-conduit.c:842
+#: calendar/conduits/calendar/calendar-conduit.c:896
+#: calendar/conduits/calendar/calendar-conduit.c:899
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:653
-#: calendar/conduits/todo/todo-conduit.c:656
+#: calendar/conduits/todo/todo-conduit.c:668
+#: calendar/conduits/todo/todo-conduit.c:671
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
@@ -3016,46 +3050,46 @@ msgstr ""
 msgid "Factory for the alarm notification service"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:152
 #, c-format
 msgid "Notification about your appointment starting on %s and ending on %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:156
 #, c-format
 msgid "Notification about your appointment starting on %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:161
 #, c-format
 msgid "Notification about your appointment ending on %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:165
 #, fuzzy
 msgid "Notification about your appointment"
 msgstr "�_�������"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:172
 #, c-format
 msgid "Notification about your task starting on %s and ending on %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:176
 #, c-format
 msgid "Notification about your task starting on %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:181
 #, c-format
 msgid "Notification about your task ending on %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:185
 msgid "Notification about your task"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:267
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr ""
 
@@ -3142,7 +3176,7 @@ msgstr ""
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: calendar/gui/calendar-commands.c:467
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1442
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1446
 msgid "%d %B"
 msgstr ""
 
@@ -3151,18 +3185,18 @@ msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:399 calendar/gui/calendar-model.c:1001
-#: calendar/gui/e-calendar-table.c:307
+#: calendar/gui/calendar-model.c:399 calendar/gui/calendar-model.c:994
+#: calendar/gui/e-calendar-table.c:364
 #, fuzzy
 msgid "Private"
 msgstr "����������"
 
-#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:1003
-#: calendar/gui/e-calendar-table.c:308
+#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:996
+#: calendar/gui/e-calendar-table.c:365
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:306
+#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:363
 msgid "Public"
 msgstr ""
 
@@ -3182,70 +3216,49 @@ msgstr ""
 msgid "W"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:538 calendar/gui/calendar-model.c:1183
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:652
-msgid "High"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1185
-#: calendar/gui/calendar-model.c:1700
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:651
-#, fuzzy
-msgid "Normal"
-msgstr "���"
-
-#: calendar/gui/calendar-model.c:542 calendar/gui/calendar-model.c:1187
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:650
-#, fuzzy
-msgid "Low"
-msgstr "_���"
-
-#: calendar/gui/calendar-model.c:573 calendar/gui/calendar-model.c:1220
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/calendar-model.c:566 calendar/gui/calendar-model.c:1193
+#: calendar/gui/e-calendar-table.c:437
 #, fuzzy
 msgid "Free"
 msgstr "���"
 
-#: calendar/gui/calendar-model.c:575 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/calendar-model.c:568 calendar/gui/e-calendar-table.c:438
 #: calendar/gui/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:724 calendar/gui/calendar-model.c:1268
+#: calendar/gui/calendar-model.c:717 calendar/gui/calendar-model.c:1241
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:401
+#: calendar/gui/e-calendar-table.c:458
 msgid "Not Started"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:727 calendar/gui/calendar-model.c:1270
+#: calendar/gui/calendar-model.c:720 calendar/gui/calendar-model.c:1243
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:402
+#: calendar/gui/e-calendar-table.c:459
 msgid "In Progress"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:730 calendar/gui/calendar-model.c:1272
+#: calendar/gui/calendar-model.c:723 calendar/gui/calendar-model.c:1245
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-meeting-model.c:298
+#: calendar/gui/e-calendar-table.c:460 calendar/gui/e-meeting-model.c:298
 #: calendar/gui/e-meeting-model.c:321
 msgid "Completed"
 msgstr ""
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:915 e-util/e-time-utils.c:163
+#: calendar/gui/calendar-model.c:908 e-util/e-time-utils.c:163
 #: e-util/e-time-utils.c:354
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr ""
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:918 e-util/e-time-utils.c:158
+#: calendar/gui/calendar-model.c:911 e-util/e-time-utils.c:158
 #: e-util/e-time-utils.c:363
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:923
+#: calendar/gui/calendar-model.c:916
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -3253,55 +3266,44 @@ msgid ""
 "%s"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1087
+#: calendar/gui/calendar-model.c:1080
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1127
+#: calendar/gui/calendar-model.c:1120
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1168
-msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
-msgstr ""
-
-#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1181
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:331
-msgid "Undefined"
-msgstr ""
-
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1266 calendar/gui/dialogs/meeting-page.c:332
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1444
+#: calendar/gui/calendar-model.c:1239 calendar/gui/dialogs/meeting-page.c:332
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1446
 #: mail/mail-accounts.c:143 mail/mail-accounts.c:390
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:50
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:203
-#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
-#: widgets/misc/e-dateedit.c:1428 widgets/misc/e-dateedit.c:1543
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:453
+#: widgets/misc/e-dateedit.c:1453 widgets/misc/e-dateedit.c:1568
 #, fuzzy
 msgid "None"
 msgstr "������_��"
 
-#: calendar/gui/calendar-model.c:1702
+#: calendar/gui/calendar-model.c:1675
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1704
+#: calendar/gui/calendar-model.c:1677
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1710 calendar/gui/e-meeting-model.c:270
+#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:270
 #: calendar/gui/e-meeting-model.c:280 calendar/gui/e-meeting-model.c:506
 #: calendar/gui/e-meeting-model.c:702
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1710 calendar/gui/e-meeting-model.c:282
+#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:282
 #: calendar/gui/e-meeting-model.c:703
 #, fuzzy
 msgid "No"
@@ -3344,47 +3346,47 @@ msgstr "����"
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/component-factory.c:62 my-evolution/my-evolution.glade.h:6
+#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:6
 #: shell/e-local-storage.c:172 shell/e-shortcuts.c:1056
 #, fuzzy
 msgid "Calendar"
 msgstr "����������"
 
-#: calendar/gui/component-factory.c:63
+#: calendar/gui/component-factory.c:64
 #, fuzzy
 msgid "Folder containing appointments and events"
 msgstr "�������� ��� �������� �������� �����������"
 
-#: calendar/gui/component-factory.c:67 calendar/gui/print.c:1719
-#: my-evolution/e-summary-tasks.c:215 my-evolution/e-summary-tasks.c:231
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1723
+#: my-evolution/e-summary-tasks.c:237 my-evolution/e-summary-tasks.c:253
 #: shell/e-local-storage.c:178 shell/e-shortcuts.c:1059
 #: views/tasks/galview.xml.h:1
 #, fuzzy
 msgid "Tasks"
 msgstr "�������_����"
 
-#: calendar/gui/component-factory.c:68
+#: calendar/gui/component-factory.c:69
 #, fuzzy
 msgid "Folder containing to-do items"
 msgstr "�������� ��� �������� �������� �����������"
 
-#: calendar/gui/component-factory.c:593 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:581 ui/evolution-calendar.xml.h:7
 #, fuzzy
 msgid "Create a new appointment"
 msgstr "���������� ��� �������..."
 
-#: calendar/gui/component-factory.c:594 calendar/gui/e-day-view.c:3420
+#: calendar/gui/component-factory.c:582 calendar/gui/e-day-view.c:3422
 #, fuzzy
 msgid "New _Appointment"
 msgstr "�_�������"
 
-#: calendar/gui/component-factory.c:599 ui/evolution-calendar.xml.h:8
+#: calendar/gui/component-factory.c:587 ui/evolution-calendar.xml.h:8
 #: ui/evolution-tasks.xml.h:5
 #, fuzzy
 msgid "Create a new task"
 msgstr "���������� ��� �������..."
 
-#: calendar/gui/component-factory.c:600
+#: calendar/gui/component-factory.c:588
 #, fuzzy
 msgid "New _Task"
 msgstr "�������_����"
@@ -3465,104 +3467,124 @@ msgstr ""
 msgid "minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:303
+#: calendar/gui/dialogs/alarm-page.c:307
 #, fuzzy, c-format
 msgid "%d days"
 msgstr "��������"
 
-#: calendar/gui/dialogs/alarm-page.c:305
+#: calendar/gui/dialogs/alarm-page.c:310
 #, fuzzy
 msgid "1 day"
 msgstr "��������"
 
-#: calendar/gui/dialogs/alarm-page.c:308
+#: calendar/gui/dialogs/alarm-page.c:315
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:310
+#: calendar/gui/dialogs/alarm-page.c:318
 msgid "1 week"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:313
+#: calendar/gui/dialogs/alarm-page.c:323
 #, c-format
 msgid "%d hours"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:315
+#: calendar/gui/dialogs/alarm-page.c:326
 msgid "1 hour"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:318
+#: calendar/gui/dialogs/alarm-page.c:331
 #, fuzzy, c-format
 msgid "%d minutes"
 msgstr "���������"
 
-#: calendar/gui/dialogs/alarm-page.c:320
+#: calendar/gui/dialogs/alarm-page.c:334
 #, fuzzy
 msgid "1 minute"
 msgstr "���������"
 
-#: calendar/gui/dialogs/alarm-page.c:323
+#: calendar/gui/dialogs/alarm-page.c:339
 #, fuzzy, c-format
 msgid "%d seconds"
 msgstr "��������"
 
-#: calendar/gui/dialogs/alarm-page.c:325
+#: calendar/gui/dialogs/alarm-page.c:342
 #, fuzzy
 msgid "1 second"
 msgstr "��������"
 
-#: calendar/gui/dialogs/alarm-page.c:350
+#: calendar/gui/dialogs/alarm-page.c:373
 #: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:354
+#: calendar/gui/dialogs/alarm-page.c:377
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 #, fuzzy
 msgid "Display a message"
 msgstr "�������� �������� ���������"
 
-#: calendar/gui/dialogs/alarm-page.c:358
+#: calendar/gui/dialogs/alarm-page.c:381
 #, fuzzy
 msgid "Send an email"
 msgstr "��������"
 
-#: calendar/gui/dialogs/alarm-page.c:362
+#: calendar/gui/dialogs/alarm-page.c:385
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:368 calendar/gui/dialogs/alarm-page.c:404
-#: calendar/gui/e-meeting-model.c:226 calendar/gui/e-meeting-model.c:261
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:674
-#: calendar/gui/e-meeting-model.c:690
-#: camel/providers/smtp/camel-smtp-transport.c:224
-#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
-msgid "Unknown"
+#: calendar/gui/dialogs/alarm-page.c:391
+msgid "Unknown action to be performed"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:380
-#, fuzzy
-msgid "before start of appointment"
+#: calendar/gui/dialogs/alarm-page.c:403
+#, fuzzy, c-format
+msgid "%s %s before the start of the appointment"
 msgstr "�������� �������� ���������"
 
-#: calendar/gui/dialogs/alarm-page.c:383
-#, fuzzy
-msgid "after start of appointment"
+#: calendar/gui/dialogs/alarm-page.c:406
+#, fuzzy, c-format
+msgid "%s %s after the start of the appointment"
 msgstr "�������� �������� ���������"
 
-#: calendar/gui/dialogs/alarm-page.c:393
-#, fuzzy
-msgid "before end of appointment"
+#: calendar/gui/dialogs/alarm-page.c:411
+#, fuzzy, c-format
+msgid "%s at the start of the appointment"
 msgstr "�������� �������� ���������"
 
-#: calendar/gui/dialogs/alarm-page.c:396
-#, fuzzy
-msgid "after end of appointment"
+#: calendar/gui/dialogs/alarm-page.c:420
+#, fuzzy, c-format
+msgid "%s %s before the end of the appointment"
+msgstr "�������� �������� ���������"
+
+#: calendar/gui/dialogs/alarm-page.c:423
+#, fuzzy, c-format
+msgid "%s %s after the end of the appointment"
 msgstr "�_�������"
 
+#: calendar/gui/dialogs/alarm-page.c:428
+#, fuzzy, c-format
+msgid "%s at the end of the appointment"
+msgstr "�_�������"
+
+#: calendar/gui/dialogs/alarm-page.c:439
+#, c-format
+msgid "%s at an unknown time"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:445
+#, c-format
+msgid "%s at %s"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:452
+#, c-format
+msgid "%s for an unknown trigger type"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 #, fuzzy
@@ -3918,109 +3940,109 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:159 calendar/gui/print.c:2128
+#: calendar/gui/dialogs/comp-editor-util.c:167 calendar/gui/print.c:2132
 msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:163 calendar/gui/print.c:2132
+#: calendar/gui/dialogs/comp-editor-util.c:171 calendar/gui/print.c:2136
 msgid " (Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:165 calendar/gui/print.c:2134
+#: calendar/gui/dialogs/comp-editor-util.c:173 calendar/gui/print.c:2138
 msgid "Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:170 calendar/gui/print.c:2139
+#: calendar/gui/dialogs/comp-editor-util.c:178 calendar/gui/print.c:2143
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2141
+#: calendar/gui/dialogs/comp-editor-util.c:180 calendar/gui/print.c:2145
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:515
+#: calendar/gui/dialogs/comp-editor.c:521
 #, fuzzy
 msgid "Edit Appointment"
 msgstr "�_�������"
 
-#: calendar/gui/dialogs/comp-editor.c:520
+#: calendar/gui/dialogs/comp-editor.c:526
 #, fuzzy, c-format
 msgid "Appointment - %s"
 msgstr "�_�������"
 
-#: calendar/gui/dialogs/comp-editor.c:523
+#: calendar/gui/dialogs/comp-editor.c:529
 #, fuzzy, c-format
 msgid "Task - %s"
 msgstr "������������"
 
-#: calendar/gui/dialogs/comp-editor.c:526
+#: calendar/gui/dialogs/comp-editor.c:532
 #, fuzzy, c-format
 msgid "Journal entry - %s"
 msgstr "���������� �����_������"
 
-#: calendar/gui/dialogs/comp-editor.c:540
+#: calendar/gui/dialogs/comp-editor.c:546
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:950 mail/mail-callbacks.c:1662
+#: calendar/gui/dialogs/comp-editor.c:952 mail/mail-callbacks.c:1671
 #: mail/mail-display.c:100
 msgid "Overwrite file?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:954 mail/mail-callbacks.c:1668
+#: calendar/gui/dialogs/comp-editor.c:956 mail/mail-callbacks.c:1677
 #: mail/mail-display.c:104
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1017 ui/evolution-comp-editor.xml.h:13
+#: calendar/gui/dialogs/comp-editor.c:1019 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1170
+#: calendar/gui/dialogs/comp-editor.c:1172
 msgid "Unable to obtain current version!"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:90
+#: calendar/gui/dialogs/delete-comp.c:91
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:93
+#: calendar/gui/dialogs/delete-comp.c:94
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:100
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:102
+#: calendar/gui/dialogs/delete-comp.c:103
 msgid "Are you sure you want to delete this untitled task?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:109
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:111
+#: calendar/gui/dialogs/delete-comp.c:112
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:126
+#: calendar/gui/dialogs/delete-comp.c:127
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:131
+#: calendar/gui/dialogs/delete-comp.c:132
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:136
+#: calendar/gui/dialogs/delete-comp.c:137
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr ""
@@ -4220,7 +4242,7 @@ msgstr "��������� ��������"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:18
-#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:85
+#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:86
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr ""
@@ -4242,8 +4264,8 @@ msgstr ""
 msgid "_Other Organizer"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:422 calendar/gui/print.c:1851
-#: calendar/gui/print.c:1853 calendar/gui/print.c:1854
+#: calendar/gui/dialogs/recurrence-page.c:422 calendar/gui/print.c:1855
+#: calendar/gui/print.c:1857 calendar/gui/print.c:1858
 msgid "%a %b %d %Y"
 msgstr ""
 
@@ -4373,7 +4395,7 @@ msgid "Progress"
 msgstr "�_��������"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:910
+#: my-evolution/e-summary-preferences.c:949
 msgid "URL:"
 msgstr ""
 
@@ -4395,7 +4417,7 @@ msgstr "�_�������"
 
 #: calendar/gui/dialogs/task-page.glade.h:4
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:28
 msgid "Description:"
 msgstr ""
 
@@ -4412,113 +4434,113 @@ msgstr ""
 msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:350
+#: calendar/gui/e-calendar-table.c:407
 #, c-format
 msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:351
+#: calendar/gui/e-calendar-table.c:408
 #, c-format
 msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:409
 #, c-format
 msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:410
 #, c-format
 msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:411
 #, c-format
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:412
 #, c-format
 msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:356
+#: calendar/gui/e-calendar-table.c:413
 #, c-format
 msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:357
+#: calendar/gui/e-calendar-table.c:414
 #, c-format
 msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:358
+#: calendar/gui/e-calendar-table.c:415
 #, c-format
 msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:359
+#: calendar/gui/e-calendar-table.c:416
 #, c-format
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:360
+#: calendar/gui/e-calendar-table.c:417
 #, c-format
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3441
-#: calendar/gui/e-week-view.c:3288 mail/folder-browser.c:1336
+#: calendar/gui/e-calendar-table.c:914 calendar/gui/e-day-view.c:3443
+#: calendar/gui/e-week-view.c:3296 mail/folder-browser.c:1371
 #: shell/e-shortcuts-view.c:385
 #, fuzzy
 msgid "_Open"
 msgstr "����_���"
 
-#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3450
-#: calendar/gui/e-week-view.c:3297 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:918 calendar/gui/e-day-view.c:3452
+#: calendar/gui/e-week-view.c:3305 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 #, fuzzy
 msgid "C_ut"
 msgstr "����"
 
-#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3452
-#: calendar/gui/e-week-view.c:3299 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:920 calendar/gui/e-day-view.c:3454
+#: calendar/gui/e-week-view.c:3307 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:14
 #, fuzzy
 msgid "_Copy"
 msgstr "���������"
 
-#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3427
-#: calendar/gui/e-day-view.c:3454 calendar/gui/e-week-view.c:3275
-#: calendar/gui/e-week-view.c:3301 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:922 calendar/gui/e-day-view.c:3429
+#: calendar/gui/e-day-view.c:3456 calendar/gui/e-week-view.c:3283
+#: calendar/gui/e-week-view.c:3309 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:40 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:17
 #, fuzzy
 msgid "_Paste"
 msgstr "����������"
 
-#: calendar/gui/e-calendar-table.c:863
+#: calendar/gui/e-calendar-table.c:927
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "_������"
 
-#: calendar/gui/e-calendar-table.c:865
+#: calendar/gui/e-calendar-table.c:929
 #, fuzzy
 msgid "_Delete this Task"
 msgstr "�������� �������� ���������"
 
-#: calendar/gui/e-calendar-table.c:868
+#: calendar/gui/e-calendar-table.c:932
 #, fuzzy
 msgid "_Mark Tasks as Complete"
 msgstr "_������"
 
-#: calendar/gui/e-calendar-table.c:870
+#: calendar/gui/e-calendar-table.c:934
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "�������� �������� ���������"
 
-#: calendar/gui/e-calendar-table.c:1130
+#: calendar/gui/e-calendar-table.c:1194
 #: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Click to add a task"
@@ -4529,8 +4551,8 @@ msgstr "���� ��� ��� �� ���������������"
 msgid "Alarms"
 msgstr "����������"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:702
-#: camel/camel-filter-driver.c:819
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:718
+#: camel/camel-filter-driver.c:834
 msgid "Complete"
 msgstr ""
 
@@ -4563,8 +4585,8 @@ 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:30 shell/e-shortcuts.c:1050
-#: shell/e-storage-set-view.c:1424 shell/e-summary-storage.c:80
+#: my-evolution/component-factory.c:45 shell/e-shortcuts.c:1050
+#: shell/e-storage-set-view.c:1420 shell/e-summary-storage.c:80
 #, fuzzy
 msgid "Summary"
 msgstr "��������"
@@ -4586,7 +4608,7 @@ 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:285 calendar/gui/e-day-view.c:1374
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1458
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
 msgid "%A %d %B"
 msgstr ""
 
@@ -4598,297 +4620,314 @@ msgid "%d %b"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:608 calendar/gui/e-week-view.c:344
-#: calendar/gui/print.c:765
+#: calendar/gui/e-day-view.c:608 calendar/gui/e-week-view.c:345
+#: calendar/gui/print.c:769
 msgid "am"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:347
-#: calendar/gui/print.c:767
+#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:348
+#: calendar/gui/print.c:771
 msgid "pm"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3422 calendar/gui/e-week-view.c:3270
+#: calendar/gui/e-day-view.c:3424 calendar/gui/e-week-view.c:3278
 #, fuzzy
 msgid "New All Day _Event"
 msgstr "���������� ��� �������..."
 
-#: calendar/gui/e-day-view.c:3432 calendar/gui/e-week-view.c:3280
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3288
 #: ui/evolution-calendar.xml.h:17
 #, fuzzy
 msgid "Go to _Today"
 msgstr "������"
 
-#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3282
+#: calendar/gui/e-day-view.c:3436 calendar/gui/e-week-view.c:3290
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "���������� ��� �������..."
 
-#: calendar/gui/e-day-view.c:3443 calendar/gui/e-week-view.c:3290
+#: calendar/gui/e-day-view.c:3445 calendar/gui/e-week-view.c:3298
 #, fuzzy
 msgid "_Delete this Appointment"
 msgstr "�������� �������� ���������"
 
-#: calendar/gui/e-day-view.c:3462 calendar/gui/e-week-view.c:3315
+#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3323
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "�������� �������� ���������"
 
-#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3317
+#: calendar/gui/e-day-view.c:3466 calendar/gui/e-week-view.c:3325
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "�������� �������� ���������"
 
-#: calendar/gui/e-day-view.c:3466 calendar/gui/e-week-view.c:3319
+#: calendar/gui/e-day-view.c:3468 calendar/gui/e-week-view.c:3327
 #, fuzzy
 msgid "Delete _All Occurrences"
 msgstr "�������� �������� ���������"
 
+#: calendar/gui/e-itip-control.c:469
+msgid "Meeting begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:474
+msgid "Task begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:479
+#, fuzzy
+msgid "Free/Busy info begins: <b>"
+msgstr "���������"
+
+#: calendar/gui/e-itip-control.c:483
+msgid "Begins: <b>"
+msgstr ""
+
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:677
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:664
+#: calendar/gui/e-itip-control.c:692
 #, c-format
 msgid "<b>Summary:</b> %s<br><br>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:664
+#: calendar/gui/e-itip-control.c:692
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:674
+#: calendar/gui/e-itip-control.c:702
 #, fuzzy, c-format
 msgid "<b>Description:</b> %s"
 msgstr "����"
 
-#: calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:737
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:738
 #, fuzzy
 msgid "Meeting Information"
 msgstr "�_����� ������������ ��� Evolution"
 
-#: calendar/gui/e-itip-control.c:715
+#: calendar/gui/e-itip-control.c:742
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:716
+#: calendar/gui/e-itip-control.c:743
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "������"
 
-#: calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-itip-control.c:747
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:721
+#: calendar/gui/e-itip-control.c:748
 #, fuzzy
 msgid "Meeting Update"
 msgstr "��_���� ����������"
 
-#: calendar/gui/e-itip-control.c:725
+#: calendar/gui/e-itip-control.c:752
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:726
+#: calendar/gui/e-itip-control.c:753
 #, fuzzy
 msgid "Meeting Update Request"
 msgstr "����_�� ������������"
 
-#: calendar/gui/e-itip-control.c:730
+#: calendar/gui/e-itip-control.c:757
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:731
+#: calendar/gui/e-itip-control.c:758
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "������"
 
-#: calendar/gui/e-itip-control.c:735
+#: calendar/gui/e-itip-control.c:762
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:736
+#: calendar/gui/e-itip-control.c:763
 #, fuzzy
 msgid "Meeting Cancellation"
 msgstr "�����_����� �����������"
 
-#: calendar/gui/e-itip-control.c:740 calendar/gui/e-itip-control.c:788
-#: calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:767 calendar/gui/e-itip-control.c:815
+#: calendar/gui/e-itip-control.c:848
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:741
+#: calendar/gui/e-itip-control.c:768
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "�������� ��� ���������"
 
-#: calendar/gui/e-itip-control.c:758
+#: calendar/gui/e-itip-control.c:785
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:759
+#: calendar/gui/e-itip-control.c:786
 #, fuzzy
 msgid "Task Information"
 msgstr "�_����� ������������ ��� Evolution"
 
-#: calendar/gui/e-itip-control.c:763
+#: calendar/gui/e-itip-control.c:790
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:791
 #, fuzzy
 msgid "Task Proposal"
 msgstr "�������_����"
 
-#: calendar/gui/e-itip-control.c:768
+#: calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:769
+#: calendar/gui/e-itip-control.c:796
 #, fuzzy
 msgid "Task Update"
 msgstr "��������� ������������"
 
-#: calendar/gui/e-itip-control.c:773
+#: calendar/gui/e-itip-control.c:800
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:774
+#: calendar/gui/e-itip-control.c:801
 #, fuzzy
 msgid "Task Update Request"
 msgstr "����_�� ������������"
 
-#: calendar/gui/e-itip-control.c:778
+#: calendar/gui/e-itip-control.c:805
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:806
 #, fuzzy
 msgid "Task Reply"
 msgstr "�������_����"
 
-#: calendar/gui/e-itip-control.c:783
+#: calendar/gui/e-itip-control.c:810
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:784
+#: calendar/gui/e-itip-control.c:811
 msgid "Task Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:816
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "����������"
 
-#: calendar/gui/e-itip-control.c:806
+#: calendar/gui/e-itip-control.c:833
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:807
+#: calendar/gui/e-itip-control.c:834
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "���������"
 
-#: calendar/gui/e-itip-control.c:811
+#: calendar/gui/e-itip-control.c:838
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:812
+#: calendar/gui/e-itip-control.c:839
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:816
+#: calendar/gui/e-itip-control.c:843
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:817
+#: calendar/gui/e-itip-control.c:844
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:822
+#: calendar/gui/e-itip-control.c:849
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "����������� ��������"
 
-#: calendar/gui/e-itip-control.c:889
+#: calendar/gui/e-itip-control.c:916
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:908
+#: calendar/gui/e-itip-control.c:935
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:936 calendar/gui/e-itip-control.c:942
+#: calendar/gui/e-itip-control.c:963 calendar/gui/e-itip-control.c:969
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1088
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1063
+#: calendar/gui/e-itip-control.c:1090
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.c:1134
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1142
 msgid "Attendee status ould not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1144
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1119
+#: calendar/gui/e-itip-control.c:1146
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1174
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-itip-control.c:1176
 #, fuzzy
 msgid "Removal Complete"
 msgstr "_������"
 
-#: calendar/gui/e-itip-control.c:1181 calendar/gui/e-itip-control.c:1216
+#: calendar/gui/e-itip-control.c:1208 calendar/gui/e-itip-control.c:1242
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "����������"
 
-#: calendar/gui/e-itip-control.c:1183 calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1210 calendar/gui/e-itip-control.c:1246
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1380
+#: calendar/gui/e-itip-control.c:1406
 msgid "Unable to find any of your identities in the attendees list!\n"
 msgstr ""
 
@@ -4955,6 +4994,14 @@ msgstr "��� ����������"
 msgid "Room"
 msgstr ""
 
+#: calendar/gui/e-meeting-model.c:226 calendar/gui/e-meeting-model.c:261
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:674
+#: calendar/gui/e-meeting-model.c:690
+#: camel/providers/smtp/camel-smtp-transport.c:224
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
+msgid "Unknown"
+msgstr ""
+
 #: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
 #: calendar/gui/e-meeting-model.c:686
 msgid "Chair"
@@ -5011,14 +5058,14 @@ msgstr "�_��������"
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:472
-#: calendar/gui/e-meeting-time-sel.c:1936
+#: calendar/gui/e-meeting-time-sel.c:1937
 msgid "%A, %B %d, %Y"
 msgstr ""
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:476
-#: calendar/gui/e-meeting-time-sel.c:1964 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:1965 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:345
 msgid "%a %m/%d/%Y"
 msgstr ""
@@ -5026,7 +5073,7 @@ msgstr ""
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:480 e-util/e-time-utils.c:221
-#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1552
+#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1577
 msgid "%m/%d/%Y"
 msgstr ""
 
@@ -5107,17 +5154,17 @@ msgstr "�������� ���� ���������"
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3268 calendar/gui/e-week-view.c:3306
+#: calendar/gui/e-week-view.c:3276 calendar/gui/e-week-view.c:3314
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "�_�������"
 
-#: calendar/gui/gnome-cal.c:1318
+#: calendar/gui/gnome-cal.c:1319
 #, fuzzy, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: calendar/gui/gnome-cal.c:1329
+#: calendar/gui/gnome-cal.c:1330
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
@@ -5191,204 +5238,204 @@ msgstr ""
 msgid "Could not create the component editor factory"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "1st"
 msgstr ""
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "2nd"
 msgstr ""
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "3rd"
 msgstr ""
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "4th"
 msgstr ""
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "5th"
 msgstr ""
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "6th"
 msgstr ""
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "7th"
 msgstr ""
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "8th"
 msgstr ""
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "9th"
 msgstr ""
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "10th"
 msgstr ""
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "11th"
 msgstr ""
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "12th"
 msgstr ""
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "13th"
 msgstr ""
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "14th"
 msgstr ""
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "15th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "16th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "17th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "18th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "19th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "20th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "21st"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "22nd"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "23rd"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "24th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "25th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "26th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "27th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "28th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "29th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "30th"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:432
 msgid "31st"
 msgstr ""
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "Su"
 msgstr ""
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "Mo"
 msgstr ""
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "Tu"
 msgstr ""
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "We"
 msgstr ""
 
-#: calendar/gui/print.c:497
+#: calendar/gui/print.c:500
 msgid "Th"
 msgstr ""
 
-#: calendar/gui/print.c:497
+#: calendar/gui/print.c:500
 #, fuzzy
 msgid "Fr"
 msgstr "���"
 
-#: calendar/gui/print.c:497
+#: calendar/gui/print.c:500
 msgid "Sa"
 msgstr ""
 
 #. Day
-#: calendar/gui/print.c:1827
+#: calendar/gui/print.c:1831
 msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1846 calendar/gui/print.c:1850
+#: calendar/gui/print.c:1850 calendar/gui/print.c:1854
 msgid "%a %b %d"
 msgstr ""
 
-#: calendar/gui/print.c:1847
+#: calendar/gui/print.c:1851
 msgid "%a %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1858
+#: calendar/gui/print.c:1862
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1866
+#: calendar/gui/print.c:1870
 msgid "Selected month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1873
+#: calendar/gui/print.c:1877
 msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:2214
+#: calendar/gui/print.c:2221
 #, fuzzy
 msgid "Print Calendar"
 msgstr "����������"
 
-#: calendar/gui/print.c:2302 calendar/gui/print.c:2394
-#: mail/mail-callbacks.c:2071 my-evolution/e-summary.c:551
+#: calendar/gui/print.c:2312 calendar/gui/print.c:2404
+#: mail/mail-callbacks.c:2080 my-evolution/e-summary.c:607
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
 msgstr ""
 
-#: calendar/gui/print.c:2331
+#: calendar/gui/print.c:2341
 #, fuzzy
 msgid "Print Item"
 msgstr "�������� �������� ���������"
 
-#: calendar/gui/print.c:2412
+#: calendar/gui/print.c:2422
 #, fuzzy
 msgid "Print Setup"
 msgstr "�������������"
@@ -5574,70 +5621,85 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr ""
 
-#: camel/camel-disco-store.c:305
+#: camel/camel-disco-store.c:336
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
+#: camel/camel-filter-driver.c:549 camel/camel-filter-driver.c:558
 #, fuzzy
 msgid "Syncing folders"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:659
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "���� ��� ��� �� ���������������"
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:668
 #, fuzzy
 msgid "Unable to process spool folder"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: camel/camel-filter-driver.c:667
+#: camel/camel-filter-driver.c:683
 #, fuzzy, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "��� ��������"
 
-#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
+#: camel/camel-filter-driver.c:687 camel/camel-filter-driver.c:700
 #, fuzzy, c-format
 msgid "Failed on message %d"
 msgstr "�������� �������� ���������"
 
-#: camel/camel-filter-driver.c:672
+#: camel/camel-filter-driver.c:688
 #, fuzzy
 msgid "Cannot open message"
 msgstr "����������� ��������"
 
-#: camel/camel-filter-driver.c:698 camel/camel-filter-driver.c:814
+#: camel/camel-filter-driver.c:714 camel/camel-filter-driver.c:829
 #, fuzzy
 msgid "Syncing folder"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: camel/camel-filter-driver.c:770
+#: camel/camel-filter-driver.c:786
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "��� ��������"
 
-#: camel/camel-filter-driver.c:775 camel/camel-filter-driver.c:793
+#: camel/camel-filter-driver.c:791 camel/camel-filter-driver.c:809
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "�������� �������� ���������"
 
-#: camel/camel-filter-driver.c:900
+#: camel/camel-filter-driver.c:918
 #, fuzzy, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "�������� �������� ���������"
 
-#: camel/camel-filter-driver.c:906
+#: camel/camel-filter-driver.c:924
 #, fuzzy, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: camel/camel-filter-search.c:479 camel/camel-filter-search.c:486
+#: camel/camel-filter-search.c:494 camel/camel-filter-search.c:501
 #, fuzzy, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "�������� �������� ���������"
 
+#: camel/camel-folder.c:472
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1039
+#, fuzzy, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "�������� �������� ���������"
+
+#: camel/camel-folder.c:1219
+#, fuzzy
+msgid "Moving messages"
+msgstr "����������� ��������"
+
 #: camel/camel-folder-search.c:333
 #, c-format
 msgid ""
@@ -5661,7 +5723,7 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:747 camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:748 camel/camel-folder-search.c:792
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
@@ -5760,73 +5822,73 @@ msgstr ""
 msgid "Error copying mail temp file: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:193
+#: camel/camel-pgp-context.c:191
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:196
+#: camel/camel-pgp-context.c:194
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr ""
 
-#: camel/camel-pgp-context.c:518
+#: camel/camel-pgp-context.c:525
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr ""
 
-#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:532 camel/camel-pgp-context.c:706
 msgid "Cannot sign this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:538 camel/camel-pgp-context.c:712
 #, c-format
 msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:693
+#: camel/camel-pgp-context.c:699
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr ""
 
-#: camel/camel-pgp-context.c:886
+#: camel/camel-pgp-context.c:891
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr ""
 
-#: camel/camel-pgp-context.c:892
+#: camel/camel-pgp-context.c:897
 #, c-format
 msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:903
+#: camel/camel-pgp-context.c:908
 #, fuzzy, c-format
 msgid "Cannot verify this message: couldn't create temp file: %s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: camel/camel-pgp-context.c:1069
+#: camel/camel-pgp-context.c:1076
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1079
+#: camel/camel-pgp-context.c:1086
 msgid "Cannot encrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1086
+#: camel/camel-pgp-context.c:1093
 #, c-format
 msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1095
+#: camel/camel-pgp-context.c:1102
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1258
+#: camel/camel-pgp-context.c:1264
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1266
+#: camel/camel-pgp-context.c:1272
 msgid "Cannot decrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1273
+#: camel/camel-pgp-context.c:1279
 #, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
@@ -5870,14 +5932,14 @@ msgstr ""
 msgid "(unknown host)"
 msgstr ""
 
-#: camel/camel-remote-store.c:361 camel/camel-remote-store.c:423
-#: camel/camel-remote-store.c:486
+#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
+#: camel/camel-remote-store.c:483
 #: camel/providers/imap/camel-imap-command.c:386
 #, fuzzy
 msgid "Operation cancelled"
 msgstr "�� ���������� ���"
 
-#: camel/camel-remote-store.c:489
+#: camel/camel-remote-store.c:486
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -5975,7 +6037,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:492
+#: camel/providers/imap/camel-imap-store.c:494
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -5993,7 +6055,7 @@ msgstr ""
 
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:302
-#: camel/providers/pop3/camel-pop3-provider.c:68 mail/mail-config.glade.h:54
+#: camel/providers/pop3/camel-pop3-provider.c:68 mail/mail-config.glade.h:55
 msgid "Password"
 msgstr ""
 
@@ -6023,37 +6085,37 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:154
+#: camel/camel-service.c:157
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:162
+#: camel/camel-service.c:165
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:170
+#: camel/camel-service.c:173
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:548
+#: camel/camel-service.c:602
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:575
+#: camel/camel-service.c:629
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:600
+#: camel/camel-service.c:654
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:602
+#: camel/camel-service.c:656
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
@@ -6066,12 +6128,12 @@ msgstr ""
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:322 camel/camel-session.c:391
+#: camel/camel-session.c:324 camel/camel-session.c:393
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:508
+#: camel/camel-session.c:510
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -6121,7 +6183,7 @@ msgstr ""
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: camel/camel-tcp-stream-openssl.c:463
+#: camel/camel-tcp-stream-openssl.c:491
 #, fuzzy, c-format
 msgid ""
 "Issuer: %s\n"
@@ -6129,7 +6191,7 @@ msgid ""
 msgstr "����"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:369
+#: camel/camel-tcp-stream-openssl.c:496 camel/camel-tcp-stream-ssl.c:369
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -6156,17 +6218,37 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "�������� ���� ���������"
 
-#: camel/camel-vee-folder.c:546
+#: camel/camel-vee-folder.c:554
 #, fuzzy, c-format
 msgid "No such message %s in %s"
 msgstr "�������� ��� ���������"
 
-#: camel/camel-vee-folder.c:641
+#: camel/camel-vee-folder.c:649
 #, fuzzy, c-format
 msgid "No such message: %s"
 msgstr "�������� ��� ���������"
 
-#: camel/camel-vtrash-folder.c:106
+#: camel/camel-vee-store.c:250
+#, fuzzy, c-format
+msgid "Cannot delete folder: %s: Invalid operation"
+msgstr "���������� ��� ��������� ���� ����������� �������"
+
+#: camel/camel-vee-store.c:286
+#, fuzzy, c-format
+msgid "Cannot delete folder: %s: No such folder"
+msgstr "���������� ��� ��������� ���� ����������� �������"
+
+#: camel/camel-vee-store.c:298
+#, fuzzy, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "���������� ��� ��������� ���� ����������� �������"
+
+#: camel/camel-vee-store.c:326
+#, fuzzy, c-format
+msgid "Cannot rename folder: %s: No such folder"
+msgstr "���������� ��� ��������� ���� ����������� �������"
+
+#: camel/camel-vtrash-folder.c:109
 #, fuzzy
 msgid "You cannot copy messages from this trash folder."
 msgstr "���������� ��� ��������� ���� ����������� �������"
@@ -6216,7 +6298,7 @@ msgid "Scanning for changed messages"
 msgstr "�������� ��� ���������"
 
 #: camel/providers/imap/camel-imap-folder.c:1491
-#: camel/providers/imap/camel-imap-folder.c:1890
+#: camel/providers/imap/camel-imap-folder.c:1899
 msgid "This message is not currently available"
 msgstr ""
 
@@ -6230,7 +6312,7 @@ msgstr ""
 msgid "Scanning for new messages"
 msgstr "����������� ��������"
 
-#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/imap/camel-imap-folder.c:1936
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -6247,7 +6329,7 @@ msgstr "���������� ��� ��������� ���� ����������� �������"
 msgid "Failed to cache message %s: %s"
 msgstr "�������� �������� ���������"
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:14
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:15
 msgid "Checking for new mail"
 msgstr ""
 
@@ -6256,7 +6338,7 @@ msgstr ""
 msgid "Check for new messages in all folders"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:733
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:767
 #, fuzzy
 msgid "Folders"
 msgstr "_��������"
@@ -6290,28 +6372,28 @@ msgstr ""
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:515
+#: camel/providers/imap/camel-imap-store.c:517
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:525
+#: camel/providers/imap/camel-imap-store.c:527
 #: camel/providers/smtp/camel-smtp-transport.c:388
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap/camel-imap-store.c:551
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:566
 #: camel/providers/smtp/camel-smtp-transport.c:432
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:590
+#: camel/providers/imap/camel-imap-store.c:592
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6319,12 +6401,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:889
+#: camel/providers/imap/camel-imap-store.c:891
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "�������� ��� ���������"
 
-#: camel/providers/imap/camel-imap-store.c:1090
+#: camel/providers/imap/camel-imap-store.c:1131
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -6358,51 +6440,51 @@ msgstr ""
 msgid "For storing local mail in qmail maildir directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:77
+#: camel/providers/local/camel-local-provider.c:78
 msgid "Standard Unix mbox spools"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:78
+#: camel/providers/local/camel-local-provider.c:79
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:127
-#: camel/providers/local/camel-spool-store.c:112
+#: camel/providers/local/camel-local-store.c:132
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:134
+#: camel/providers/local/camel-local-store.c:139
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:142
-#: camel/providers/local/camel-local-store.c:158
+#: camel/providers/local/camel-local-store.c:147
+#: camel/providers/local/camel-local-store.c:163
 #, fuzzy, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: camel/providers/local/camel-local-store.c:173
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:183
+#: camel/providers/local/camel-local-store.c:190
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:240
+#: camel/providers/local/camel-local-store.c:247
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:282
+#: camel/providers/local/camel-local-store.c:289
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:292
+#: camel/providers/local/camel-local-store.c:299
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
@@ -6673,26 +6755,26 @@ msgstr "���������� ��� ��������� ���� ����������� �������"
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: camel/providers/local/camel-spool-store.c:133
+#: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Spool `%s' does not exist or is not a regular file"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:159
+#: camel/providers/local/camel-spool-store.c:142
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:181
+#: camel/providers/local/camel-spool-store.c:164
 #, c-format
 msgid "Spool mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:227
+#: camel/providers/local/camel-spool-store.c:210
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:235
+#: camel/providers/local/camel-spool-store.c:218
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
@@ -6816,31 +6898,31 @@ msgstr "����������� ��������"
 msgid "Could not check POP server for new messages: %s"
 msgstr "�������� ���� ���������"
 
-#: camel/providers/pop3/camel-pop3-folder.c:235
+#: camel/providers/pop3/camel-pop3-folder.c:242
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:259
+#: camel/providers/pop3/camel-pop3-folder.c:266
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "�������� ��� ��������� ��� ���������"
 
-#: camel/providers/pop3/camel-pop3-folder.c:335
+#: camel/providers/pop3/camel-pop3-folder.c:342
 #, fuzzy, c-format
 msgid "Could not fetch message: %s"
 msgstr "�������� ���� ���������"
 
-#: camel/providers/pop3/camel-pop3-folder.c:351
+#: camel/providers/pop3/camel-pop3-folder.c:358
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:374
+#: camel/providers/pop3/camel-pop3-folder.c:381
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:378
+#: camel/providers/pop3/camel-pop3-folder.c:385
 #, fuzzy, c-format
 msgid "Retrieving POP message %d"
 msgstr "��� ��������"
@@ -6860,7 +6942,7 @@ msgstr "���������� ��� ��������� ���� ����������� �������"
 msgid "Delete after %s day(s)"
 msgstr "�������� �������� ���������"
 
-#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:53
+#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:54
 msgid "POP"
 msgstr ""
 
@@ -6942,7 +7024,7 @@ msgid "Unexpected response from POP server: %s"
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Sendmail"
 msgstr "��������"
@@ -6996,7 +7078,7 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:66
 msgid "SMTP"
 msgstr ""
 
@@ -7612,13 +7694,13 @@ msgstr ""
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:309 e-util/e-time-utils.c:396
-#: widgets/misc/e-dateedit.c:1360 widgets/misc/e-dateedit.c:1587
+#: widgets/misc/e-dateedit.c:1385 widgets/misc/e-dateedit.c:1612
 msgid "%I:%M %p"
 msgstr ""
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:313 e-util/e-time-utils.c:388
-#: widgets/misc/e-dateedit.c:1357 widgets/misc/e-dateedit.c:1584
+#: widgets/misc/e-dateedit.c:1382 widgets/misc/e-dateedit.c:1609
 msgid "%H:%M"
 msgstr ""
 
@@ -7764,8 +7846,8 @@ msgid ""
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:232 filter/vfolder-rule.c:351
-#: mail/mail-account-gui.c:820
+#: filter/filter-folder.c:232 filter/vfolder-rule.c:356
+#: mail/mail-account-gui.c:822
 #, fuzzy
 msgid "Select Folder"
 msgstr "_���� ��������"
@@ -8032,7 +8114,7 @@ msgstr ""
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1242
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1251
 #, fuzzy
 msgid "Sender"
 msgstr "��������"
@@ -8068,7 +8150,7 @@ msgstr ""
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:893
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:917
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "����"
@@ -8101,7 +8183,7 @@ msgstr "_��������"
 msgid "Score Rules"
 msgstr "_��������"
 
-#: filter/vfolder-rule.c:203
+#: filter/vfolder-rule.c:206
 msgid "Oops.  You need to to specify at least one folder as a source."
 msgstr ""
 
@@ -8120,19 +8202,19 @@ msgstr "���������"
 msgid "Please wait"
 msgstr ""
 
-#: importers/elm-importer.c:171 importers/netscape-importer.c:701
+#: importers/elm-importer.c:171 importers/netscape-importer.c:708
 #: importers/pine-importer.c:369
 #, c-format
 msgid "Importing %s as %s"
 msgstr ""
 
-#: importers/elm-importer.c:377 importers/netscape-importer.c:794
+#: importers/elm-importer.c:377 importers/netscape-importer.c:801
 #: importers/pine-importer.c:506
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: importers/elm-importer.c:528 importers/netscape-importer.c:967
+#: importers/elm-importer.c:528 importers/netscape-importer.c:974
 #: importers/pine-importer.c:669 mail/component-factory.c:96
 #, fuzzy
 msgid "Mail"
@@ -8168,22 +8250,22 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: importers/netscape-importer.c:897 importers/pine-importer.c:602
+#: importers/netscape-importer.c:904 importers/pine-importer.c:602
 #, fuzzy
 msgid "Scanning directory"
 msgstr "���������� ��� �������..."
 
-#: importers/netscape-importer.c:906
+#: importers/netscape-importer.c:913
 #, fuzzy
 msgid "Starting import"
 msgstr "��_���� ����������"
 
-#: importers/netscape-importer.c:972
+#: importers/netscape-importer.c:979
 #, fuzzy
 msgid "Settings"
 msgstr "�_��������"
 
-#: importers/netscape-importer.c:993
+#: importers/netscape-importer.c:1000
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8275,22 +8357,28 @@ msgstr "���������"
 msgid "Change this folder's properties"
 msgstr ""
 
-#: mail/component-factory.c:790
+#: mail/component-factory.c:698
+msgid ""
+"Some of your mail settings seem corrupt, please check that everything is in "
+"order."
+msgstr ""
+
+#: mail/component-factory.c:812
 #, fuzzy
 msgid "New Mail Message"
 msgstr "_������"
 
-#: mail/component-factory.c:790
+#: mail/component-factory.c:812
 #, fuzzy
 msgid "New _Mail Message"
 msgstr "_������"
 
-#: mail/component-factory.c:821
+#: mail/component-factory.c:843
 #, fuzzy
 msgid "Cannot initialize Evolution's mail component."
 msgstr "������������� ��� ���������� ������� Bonobo ����������"
 
-#: mail/component-factory.c:1007
+#: mail/component-factory.c:1032
 msgid "Cannot register storage with shell"
 msgstr ""
 
@@ -8304,178 +8392,178 @@ msgstr "���������"
 msgid "Properties"
 msgstr "���������"
 
-#: mail/folder-browser.c:239 mail/mail-display.c:275
+#: mail/folder-browser.c:262 mail/mail-display.c:275
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/folder-browser.c:708
+#: mail/folder-browser.c:734
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/folder-browser.c:711 mail/folder-browser.c:716
-#: mail/folder-browser.c:720
+#: mail/folder-browser.c:737 mail/folder-browser.c:742
+#: mail/folder-browser.c:746
 msgid ", "
 msgstr ""
 
-#: mail/folder-browser.c:712
+#: mail/folder-browser.c:738
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/folder-browser.c:717
+#: mail/folder-browser.c:743
 #, fuzzy, c-format
 msgid "%d selected"
 msgstr "��������"
 
-#: mail/folder-browser.c:722
+#: mail/folder-browser.c:748
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr "��������"
 
-#: mail/folder-browser.c:724
+#: mail/folder-browser.c:750
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/folder-browser.c:958
+#: mail/folder-browser.c:993
 #, fuzzy
 msgid "Create vFolder from Search"
 msgstr "�������� ��������"
 
-#: mail/folder-browser.c:1303
+#: mail/folder-browser.c:1338
 #, fuzzy
 msgid "VFolder on _Subject"
 msgstr "����"
 
-#: mail/folder-browser.c:1306
+#: mail/folder-browser.c:1341
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:1309
+#: mail/folder-browser.c:1344
 #, fuzzy
 msgid "VFolder on _Recipients"
 msgstr "��������� ���������"
 
-#: mail/folder-browser.c:1312
+#: mail/folder-browser.c:1347
 #, fuzzy
 msgid "VFolder on Mailing _List"
 msgstr "�������� ��� �������� ��������"
 
-#: mail/folder-browser.c:1318
+#: mail/folder-browser.c:1353
 #, fuzzy
 msgid "Filter on Sub_ject"
 msgstr "����"
 
-#: mail/folder-browser.c:1321
+#: mail/folder-browser.c:1356
 #, fuzzy
 msgid "Filter on Sen_der"
 msgstr "����"
 
-#: mail/folder-browser.c:1324
+#: mail/folder-browser.c:1359
 #, fuzzy
 msgid "Filter on Re_cipients"
 msgstr "��������� ���������"
 
-#: mail/folder-browser.c:1327
+#: mail/folder-browser.c:1362
 #, fuzzy
 msgid "Filter on _Mailing List"
 msgstr "�������� ��� �������� ��������"
 
-#: mail/folder-browser.c:1338 ui/evolution-mail-message.xml.h:89
+#: mail/folder-browser.c:1373 ui/evolution-mail-message.xml.h:89
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "����������� ��������"
 
-#: mail/folder-browser.c:1340 ui/evolution-mail-message.xml.h:97
+#: mail/folder-browser.c:1375 ui/evolution-mail-message.xml.h:97
 #, fuzzy
 msgid "_Save As..."
 msgstr "���������� ��� �������..."
 
-#: mail/folder-browser.c:1342
+#: mail/folder-browser.c:1377
 #, fuzzy
 msgid "_Print"
 msgstr "�������������"
 
-#: mail/folder-browser.c:1347 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1382 ui/evolution-mail-message.xml.h:96
 #, fuzzy
 msgid "_Reply to Sender"
 msgstr "���������� ��� �������..."
 
-#: mail/folder-browser.c:1349 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1384 ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Reply to _List"
 msgstr "���������� ��� �������..."
 
-#: mail/folder-browser.c:1351 ui/evolution-mail-message.xml.h:68
+#: mail/folder-browser.c:1386 ui/evolution-mail-message.xml.h:68
 msgid "Reply to _All"
 msgstr ""
 
-#: mail/folder-browser.c:1353
+#: mail/folder-browser.c:1388
 msgid "_Forward"
 msgstr ""
 
-#: mail/folder-browser.c:1356 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1391 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/folder-browser.c:1358 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1393 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr ""
 
-#: mail/folder-browser.c:1360
+#: mail/folder-browser.c:1395
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/folder-browser.c:1362
+#: mail/folder-browser.c:1397
 msgid "Mark as Unim_portant"
 msgstr ""
 
-#: mail/folder-browser.c:1367
+#: mail/folder-browser.c:1402
 #, fuzzy
 msgid "_Move to Folder..."
 msgstr "���������� ��� �������..."
 
-#: mail/folder-browser.c:1369
+#: mail/folder-browser.c:1404
 #, fuzzy
 msgid "_Copy to Folder..."
 msgstr "���������� ��� �������..."
 
-#: mail/folder-browser.c:1373 ui/evolution-mail-message.xml.h:99
+#: mail/folder-browser.c:1408 ui/evolution-mail-message.xml.h:99
 msgid "_Undelete"
 msgstr ""
 
-#: mail/folder-browser.c:1378
+#: mail/folder-browser.c:1413
 #, fuzzy
 msgid "Add Sender to Address Book"
 msgstr "���� ��� ��� �� ���������������"
 
-#: mail/folder-browser.c:1383
+#: mail/folder-browser.c:1418
 #, fuzzy
 msgid "Apply Filters"
 msgstr "_��������"
 
-#: mail/folder-browser.c:1387
+#: mail/folder-browser.c:1422
 #, fuzzy
 msgid "Create Ru_le From Message"
 msgstr "�������� ��������"
 
-#: mail/folder-browser.c:1538
+#: mail/folder-browser.c:1573
 msgid "Filter on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1539
+#: mail/folder-browser.c:1574
 #, fuzzy
 msgid "VFolder on Mailing List"
 msgstr "�������� ��� �������� ��������"
 
-#: mail/folder-browser.c:1541
+#: mail/folder-browser.c:1576
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:1542
+#: mail/folder-browser.c:1577
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr ""
@@ -8554,24 +8642,24 @@ msgstr "�_����� ������������ ��� Evolution"
 msgid "Evolution Account Editor"
 msgstr "�_����� ������������ ��� Evolution"
 
-#: mail/mail-account-gui.c:945
+#: mail/mail-account-gui.c:947
 #, fuzzy
 msgid "Could not save signature file."
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: mail/mail-account-gui.c:1022
+#: mail/mail-account-gui.c:1024
 #, fuzzy
 msgid "Save signature"
 msgstr "���� ��� ��� �� ���������������"
 
-#: mail/mail-account-gui.c:1028
+#: mail/mail-account-gui.c:1030
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: mail/mail-account-gui.c:1611
+#: mail/mail-account-gui.c:1615
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -8604,7 +8692,7 @@ msgid "Are you sure you want to delete this news account?"
 msgstr ""
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:757 mail/mail-config.glade.h:42
+#: mail/mail-accounts.c:760 mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Mail Settings"
 msgstr "�_��������"
@@ -8697,72 +8785,72 @@ msgstr ""
 msgid "This message contains invalid recipients:"
 msgstr ""
 
-#: mail/mail-callbacks.c:453
+#: mail/mail-callbacks.c:454
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:549
+#: mail/mail-callbacks.c:550
 msgid "You must configure an account before you can send this email."
 msgstr ""
 
-#: mail/mail-callbacks.c:779
+#: mail/mail-callbacks.c:783
 msgid "an unknown sender"
 msgstr ""
 
-#: mail/mail-callbacks.c:784
+#: mail/mail-callbacks.c:788
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1162
+#: mail/mail-callbacks.c:1171
 #, fuzzy
 msgid "Move message(s) to"
 msgstr "��� ��������"
 
-#: mail/mail-callbacks.c:1164
+#: mail/mail-callbacks.c:1173
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "��� ��������"
 
-#: mail/mail-callbacks.c:1538
+#: mail/mail-callbacks.c:1547
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1560
+#: mail/mail-callbacks.c:1569
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1594
+#: mail/mail-callbacks.c:1603
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1606
+#: mail/mail-callbacks.c:1615
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1627
+#: mail/mail-callbacks.c:1636
 #, fuzzy
 msgid "No Message Selected"
 msgstr "��������� ���������"
 
-#: mail/mail-callbacks.c:1712
+#: mail/mail-callbacks.c:1721
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:1714
+#: mail/mail-callbacks.c:1723
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:1859 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:1868 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr ""
 
-#: mail/mail-callbacks.c:1864
+#: mail/mail-callbacks.c:1873
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8770,33 +8858,33 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1871
+#: mail/mail-callbacks.c:1880
 #, fuzzy
 msgid "Do not ask me again."
 msgstr "�������� �������� ���������"
 
-#: mail/mail-callbacks.c:1976
+#: mail/mail-callbacks.c:1985
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:1986
+#: mail/mail-callbacks.c:1995
 #, fuzzy
 msgid "Filters"
 msgstr "_��������"
 
-#: mail/mail-callbacks.c:2032
+#: mail/mail-callbacks.c:2041
 #, fuzzy
 msgid "Print Message"
 msgstr "����������� ��������"
 
-#: mail/mail-callbacks.c:2078
+#: mail/mail-callbacks.c:2087
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-callbacks.c:2162
+#: mail/mail-callbacks.c:2171
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -8843,91 +8931,110 @@ msgstr ""
 msgid "Evolution Account Assistant"
 msgstr "�_����� ������������ ��� Evolution"
 
-#: mail/mail-config.c:1486
-#, fuzzy
-msgid "Evolution Shortcuts"
-msgstr "�_����� ������������ ��� Evolution"
+#: mail/mail-config.c:315
+#, fuzzy, c-format
+msgid "Account %d"
+msgstr "����� ���������"
 
-#. right now, the URL always works basically as a matter of luck...
-#. * both IMAP and mbox spool stores have INBOX as their inbox folder
-#. * name. I don't think this will work with maildir. How can we figure out
-#. * what shortcut to insert?
-#.
 #: mail/mail-config.c:1618
+#, c-format
+msgid ""
+"Could not get inbox for new mail store:\n"
+"%s\n"
+"No shortcut will be created."
+msgstr ""
+
+#. Create the shortcut. FIXME: This only works if the
+#. * full name matches the path.
+#.
+#: mail/mail-config.c:1629
 #, fuzzy, c-format
 msgid "%s: Inbox"
 msgstr "�����������"
 
-#: mail/mail-config.c:1851
+#: mail/mail-config.c:1873
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:1922 mail/mail-config.c:1925
+#: mail/mail-config.c:1944 mail/mail-config.c:1947
 msgid "Connecting to server..."
 msgstr ""
 
 #: mail/mail-config.glade.h:1
-msgid " color"
+msgid " _Check for supported types "
 msgstr ""
 
 #: mail/mail-config.glade.h:2
-msgid "(SSL is not supported in this build of evolution)"
+msgid " color"
 msgstr ""
 
 #: mail/mail-config.glade.h:3
+msgid "(SSL is not supported in this build of evolution)"
+msgstr ""
+
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "Account"
 msgstr "����� ���������"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "Account Information"
 msgstr "���������"
 
-#: mail/mail-config.glade.h:5 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:6 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "Accounts"
 msgstr "����� ���������"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:10
 msgid "Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:10 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
 #, fuzzy
 msgid "Attachment"
 msgstr "��� ���������"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:12
 msgid "Authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:13
 msgid "Authentication Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:14
 msgid "Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:16
 #, fuzzy
 msgid "Composer"
 msgstr "��� ����������"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:17
+#, fuzzy
+msgid "Configuration"
+msgstr "�_����� ������������ ��� Evolution"
+
+#: mail/mail-config.glade.h:18
+msgid "Confirm when Expunging a folder"
+msgstr ""
+
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -8937,344 +9044,328 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:26
 msgid "Default Forward style is: "
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:27
 msgid "Default character encoding: "
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:29
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:30
 msgid "Display"
 msgstr ""
 
-#: mail/mail-config.glade.h:27 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:31 shell/glade/evolution-startup-wizard.glade.h:2
 #, fuzzy
 msgid "Done"
 msgstr "������_��"
 
-#: mail/mail-config.glade.h:28 shell/e-local-storage.c:174
+#: mail/mail-config.glade.h:32 shell/e-local-storage.c:174
 #, fuzzy
 msgid "Drafts"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "Drafts folder:"
 msgstr "���������� ��� �������..."
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:34
 msgid "E_nable"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
-msgid "Each account must have a different name."
-msgstr ""
-
-#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:96
 #: widgets/misc/e-filter-bar.h:103
 #, fuzzy
 msgid "Edit..."
 msgstr "�������������"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:36
 msgid "Enabled"
 msgstr ""
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:37
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:38
 msgid "HTML signature file:"
 msgstr ""
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:39
 msgid "IMAPv4 "
 msgstr ""
 
-#: mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:40 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:41
 msgid "In HTML mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:42
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Kerberos "
 msgstr "��������"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Mail Configuration"
 msgstr "�_����� ������������ ��� Evolution"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Mailbox location"
 msgstr "���"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:47
 msgid "Make this my _default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:45
-msgid "Message _preview should be displayed by default"
-msgstr ""
-
-#: mail/mail-config.glade.h:46
-msgid "Message list should display in a _threaded fashion by default"
-msgstr ""
-
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "NNTP Server:"
 msgstr "��� �����"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "News"
 msgstr "_���"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Optional Information"
 msgstr "�_����� ������������ ��� Evolution"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:53
 msgid "PGP Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 msgid "Pick a color"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 msgid "Prompt when sending messages with an _empty subject"
 msgstr ""
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:60
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid "Quoted"
 msgstr "������_��"
 
-#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:63
 msgid "Receiving Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:64
 msgid "Receiving Options"
 msgstr ""
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:65
 msgid "Required Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:67
 msgid "Secure MIME"
 msgstr ""
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:68
 msgid "Security"
 msgstr ""
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Select Filter Log file..."
 msgstr "�����_����� �����������"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:70
 msgid "Select PGP binary"
 msgstr ""
 
-#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:71 shell/glade/evolution-startup-wizard.glade.h:7
 #, fuzzy
 msgid "Sending Email"
 msgstr "��������"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Sending Mail"
 msgstr "��������"
 
-#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:74 mail/message-list.etspec.h:6
 #: shell/e-local-storage.c:177
 #, fuzzy
 msgid "Sent"
 msgstr "��������"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "�������� ��� ���������"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Sent messages folder:"
 msgstr "�������� ��� ���������"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Server Configuration"
 msgstr "�_����� ������������ ��� Evolution"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Server Type: "
 msgstr "��������"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 msgid "Server requires _authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:80
 msgid "Signature file:"
 msgstr ""
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Source"
 msgstr "��� ����������"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "Source Information"
 msgstr "���������"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Sources"
 msgstr "��� ����������"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Special Folders"
 msgstr "_��������"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:85
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:87
 msgid "Use secure connection (_SSL)"
 msgstr ""
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:88
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:92
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:93
 msgid "_Automatically check for new mail every"
 msgstr ""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:94
 msgid "_Check for supported types"
 msgstr ""
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "_Email Address:"
 msgstr "���� ��� ��� �� ���������������"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:98
 msgid "_Empty trash folders on exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 #, fuzzy
 msgid "_Full Name:"
 msgstr "����������� ������"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "_HTML Signature:"
 msgstr "���� ��� ��� �� ���������������"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 msgid "_Highlight citations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:102
 msgid "_Host:"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 msgid "_Log filter actions to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 #, fuzzy
 msgid "_Mark messages as Read after"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 #, fuzzy
 msgid "_Name:"
 msgstr "����������� ������"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 msgid "_Organization:"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:109
 msgid "_PGP binary path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "_Path:"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:110
-msgid "_Remember PGP Passphrase until exit"
-msgstr ""
-
 #: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "_Remember this password"
@@ -9312,39 +9403,39 @@ msgstr ""
 msgid "seconds."
 msgstr "��������"
 
-#: mail/mail-crypto.c:60
+#: mail/mail-crypto.c:59
 msgid "Could not create a PGP signature context."
 msgstr ""
 
-#: mail/mail-crypto.c:86
+#: mail/mail-crypto.c:84
 msgid "Could not create a PGP verification context."
 msgstr ""
 
-#: mail/mail-crypto.c:116
+#: mail/mail-crypto.c:113
 msgid "Could not create a PGP encryption context."
 msgstr ""
 
-#: mail/mail-crypto.c:142
+#: mail/mail-crypto.c:138
 msgid "Could not create a PGP decryption context."
 msgstr ""
 
-#: mail/mail-crypto.c:177
+#: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
 msgstr ""
 
-#: mail/mail-crypto.c:209
+#: mail/mail-crypto.c:205
 msgid "Could not create a S/MIME certsonly context."
 msgstr ""
 
-#: mail/mail-crypto.c:240
+#: mail/mail-crypto.c:236
 msgid "Could not create a S/MIME encryption context."
 msgstr ""
 
-#: mail/mail-crypto.c:271
+#: mail/mail-crypto.c:267
 msgid "Could not create a S/MIME envelope context."
 msgstr ""
 
-#: mail/mail-crypto.c:301
+#: mail/mail-crypto.c:297
 msgid "Could not create a S/MIME decode context."
 msgstr ""
 
@@ -9394,12 +9485,12 @@ msgstr "������� �� ��� ��������"
 msgid "Copy Link Location"
 msgstr "_��������"
 
-#: mail/mail-display.c:1519
+#: mail/mail-display.c:1520
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "���������� ��� �������..."
 
-#: mail/mail-display.c:1521
+#: mail/mail-display.c:1523
 #, fuzzy
 msgid "Save Image as..."
 msgstr "���������� ��� �������..."
@@ -9418,140 +9509,140 @@ msgstr ""
 msgid "Date"
 msgstr "����������"
 
-#: mail/mail-format.c:860
+#: mail/mail-format.c:862
 #, fuzzy
 msgid "Bad Address"
 msgstr "���� ��� ��� �� ���������������"
 
-#: mail/mail-format.c:882 mail/message-list.etspec.h:3
+#: mail/mail-format.c:903 mail/message-list.etspec.h:3
 #, fuzzy
 msgid "From"
 msgstr "���"
 
-#: mail/mail-format.c:885
+#: mail/mail-format.c:906
 #, fuzzy
 msgid "Reply-To"
 msgstr "������"
 
-#: mail/mail-format.c:888 mail/message-list.etspec.h:10
+#: mail/mail-format.c:910 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "����"
 
-#: mail/mail-format.c:891
+#: mail/mail-format.c:914
 #, fuzzy
 msgid "Cc"
 msgstr "���������:"
 
-#: mail/mail-format.c:1311
+#: mail/mail-format.c:1357
 msgid "No GPG/PGP program configured."
 msgstr ""
 
-#: mail/mail-format.c:1327
+#: mail/mail-format.c:1373
 msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-format.c:1338
+#: mail/mail-format.c:1384
 #, fuzzy
 msgid "Encrypted message"
 msgstr "�������� ��� ���������"
 
-#: mail/mail-format.c:1339
+#: mail/mail-format.c:1385
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1394
+#: mail/mail-format.c:1440
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1405
+#: mail/mail-format.c:1451
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2083
+#: mail/mail-format.c:2128
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2097
+#: mail/mail-format.c:2142
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2102
+#: mail/mail-format.c:2147
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2131
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2139
+#: mail/mail-format.c:2184
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2144
+#: mail/mail-format.c:2189
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:547
+#: mail/mail-local.c:563
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "_���� ��������"
 
-#: mail/mail-local.c:620
+#: mail/mail-local.c:636
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:676
+#: mail/mail-local.c:689
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: mail/mail-local.c:722
+#: mail/mail-local.c:735
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: mail/mail-local.c:1052
+#: mail/mail-local.c:1075
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1067
+#: mail/mail-local.c:1090
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1089
+#: mail/mail-local.c:1112
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1180
+#: mail/mail-local.c:1200
 #, fuzzy
 msgid "You cannot change the format of a non-local folder."
 msgstr "�� Evolution �� ������ �� ������������ ���� �������� ���������"
 
-#: mail/mail-local.c:1190
+#: mail/mail-local.c:1209
 #, fuzzy, c-format
-msgid "Reconfigure %s"
+msgid "Reconfigure /%s"
 msgstr "_���� ��������"
 
-#: mail/mail-mt.c:188
+#: mail/mail-mt.c:199
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:191
+#: mail/mail-mt.c:202
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -9559,21 +9650,25 @@ msgid ""
 msgstr ""
 
 #. Remember the password?
-#: mail/mail-mt.c:454
+#: mail/mail-mt.c:509
 msgid "Remember this password"
 msgstr ""
 
-#: mail/mail-mt.c:511
+#: mail/mail-mt.c:510
+msgid "Remember this password for the remainder of this session"
+msgstr ""
+
+#: mail/mail-mt.c:567
 #, c-format
 msgid "Enter Password for %s"
 msgstr ""
 
-#: mail/mail-mt.c:514
+#: mail/mail-mt.c:570
 #, fuzzy
 msgid "Enter Password"
 msgstr "����������"
 
-#: mail/mail-mt.c:824
+#: mail/mail-mt.c:886
 msgid "Working"
 msgstr ""
 
@@ -9730,6 +9825,11 @@ msgstr ""
 msgid "Disconnecting from %s"
 msgstr ""
 
+#: mail/mail-ops.c:2065
+#, fuzzy, c-format
+msgid "Reconnecting to %s"
+msgstr "���������� ��� ��������� ���� ����������� �������"
+
 #: mail/mail-search-dialogue.c:113
 #, fuzzy
 msgid "_Search"
@@ -9792,12 +9892,12 @@ msgstr ""
 msgid "Type: %s"
 msgstr "����:"
 
-#: mail/mail-send-recv.c:282
+#: mail/mail-send-recv.c:283
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "������"
 
-#: mail/mail-send-recv.c:283
+#: mail/mail-send-recv.c:284
 #, fuzzy
 msgid "Cancel All"
 msgstr "����������"
@@ -9820,37 +9920,51 @@ msgstr ""
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-tools.c:173
+#: mail/mail-tools.c:133
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr ""
 
-#: mail/mail-tools.c:299
+#: mail/mail-tools.c:259
 #, fuzzy, c-format
 msgid "Forwarded message - %s"
 msgstr "�������� �������� ���������"
 
-#: mail/mail-tools.c:303
+#: mail/mail-tools.c:263
 #, fuzzy
 msgid "Forwarded message"
 msgstr "�������� �������� ���������"
 
-#: mail/mail-tools.c:439
+#: mail/mail-tools.c:396
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "�������� �������� ���������"
 
-#: mail/mail-vfolder.c:161
+#: mail/mail-vfolder.c:84
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: mail/mail-vfolder.c:435
+#: mail/mail-vfolder.c:201
+#, fuzzy, c-format
+msgid "Updating vfolders for uri: %s"
+msgstr "���������� ��� ��������� ���� ����������� �������"
+
+#: mail/mail-vfolder.c:414
+#, c-format
+msgid ""
+"The following vFolder(s):\n"
+"%sUsed the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+
+#: mail/mail-vfolder.c:636
 #, fuzzy
 msgid "VFolders"
 msgstr "_��������"
 
-#: mail/mail-vfolder.c:541
+#: mail/mail-vfolder.c:742
 #, fuzzy
 msgid "New VFolder"
 msgstr "_���� ��������"
@@ -9924,7 +10038,7 @@ msgstr ""
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:2331
+#: mail/message-list.c:2334
 #, fuzzy
 msgid "Generating message list"
 msgstr "����������� ��������"
@@ -10017,34 +10131,34 @@ msgstr "��� ����������"
 msgid "Evolution component for the executive summary."
 msgstr ""
 
-#: my-evolution/component-factory.c:30
+#: my-evolution/component-factory.c:45
 msgid "Folder containing the Evolution Summary"
 msgstr ""
 
-#: my-evolution/component-factory.c:139
+#: my-evolution/component-factory.c:154
 #, fuzzy
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr "������������� ��� ���������� ������� Bonobo ����������"
 
-#: my-evolution/e-summary-calendar.c:248 my-evolution/e-summary-calendar.c:266
+#: my-evolution/e-summary-calendar.c:263 my-evolution/e-summary-calendar.c:281
 #, fuzzy
 msgid "Appointments"
 msgstr "�_�������"
 
-#: my-evolution/e-summary-calendar.c:249
+#: my-evolution/e-summary-calendar.c:264
 #, fuzzy
 msgid "No appointments"
 msgstr "�_�������"
 
-#: my-evolution/e-summary-calendar.c:286
+#: my-evolution/e-summary-calendar.c:301
 msgid "%k%M %d %B"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:288
+#: my-evolution/e-summary-calendar.c:303
 msgid "%l:%M %d %B"
 msgstr ""
 
-#: my-evolution/e-summary-mail.c:115
+#: my-evolution/e-summary-mail.c:130
 #, fuzzy
 msgid "Mail summary"
 msgstr "��������"
@@ -10053,90 +10167,90 @@ msgstr "��������"
 #. see in My Evolution by default. You can find the list of all
 #. stations and their codes in Evolution sources
 #. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-preferences.c:65
-#: my-evolution/e-summary-weather.c:615
+#: my-evolution/e-summary-preferences.c:80
+#: my-evolution/e-summary-weather.c:630
 msgid "KBOS:ZSAM:EGAA"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:427
+#: my-evolution/e-summary-preferences.c:441
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:449
+#: my-evolution/e-summary-preferences.c:463
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:890
+#: my-evolution/e-summary-preferences.c:929
 #, fuzzy
 msgid "Add a news feed"
 msgstr "��� �����"
 
-#: my-evolution/e-summary-preferences.c:898
+#: my-evolution/e-summary-preferences.c:937
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:902
+#: my-evolution/e-summary-preferences.c:941
 msgid "Name:"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:1438
+#: my-evolution/e-summary-preferences.c:1486
 #, fuzzy
 msgid "Summary Settings"
 msgstr "��������"
 
-#: my-evolution/e-summary-rdf.c:277 my-evolution/e-summary-rdf.c:362
-#: my-evolution/e-summary-rdf.c:395
+#: my-evolution/e-summary-rdf.c:297 my-evolution/e-summary-rdf.c:382
+#: my-evolution/e-summary-rdf.c:415
 #, fuzzy
 msgid "Error downloading RDF"
 msgstr "�������� �������� ���������"
 
-#: my-evolution/e-summary-rdf.c:487
+#: my-evolution/e-summary-rdf.c:507
 #, fuzzy
 msgid "News Feed"
 msgstr "��� ����������"
 
-#: my-evolution/e-summary-tasks.c:216
+#: my-evolution/e-summary-tasks.c:238
 #, fuzzy
 msgid "No tasks"
 msgstr "�������� �������_����"
 
-#: my-evolution/e-summary-tasks.c:255
+#: my-evolution/e-summary-tasks.c:277
 #, fuzzy
 msgid "(No Description)"
 msgstr "����"
 
-#: my-evolution/e-summary-weather.c:57
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:334
+#: my-evolution/e-summary-weather.c:349
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:524
+#: my-evolution/e-summary-weather.c:539
 #, fuzzy
 msgid "Weather"
 msgstr "����������"
 
-#: my-evolution/e-summary-weather.c:676
+#: my-evolution/e-summary-weather.c:691
 #, fuzzy
 msgid "Regions"
 msgstr "�_��������"
 
-#: my-evolution/e-summary.c:162
+#: my-evolution/e-summary.c:187
 msgid "%A, %B %e %Y"
 msgstr ""
 
-#: my-evolution/e-summary.c:512 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:568 ui/my-evolution.xml.h:3
 #, fuzzy
 msgid "Print Summary"
 msgstr "��������"
 
-#: my-evolution/e-summary.c:558
+#: my-evolution/e-summary.c:614
 msgid "Printing of Summary failed"
 msgstr ""
 
-#: my-evolution/main.c:52
+#: my-evolution/main.c:67
 #, fuzzy
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "������ ���/�����: ������������ ��� Bonobo �������"
@@ -11570,75 +11684,73 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:174
+#: shell/e-shell-folder-commands.c:176
 #, fuzzy
 msgid "Cannot move a folder over itself."
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:178
 msgid "Cannot copy a folder over itself."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:190
+#: shell/e-shell-folder-commands.c:192
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:294
+#: shell/e-shell-folder-commands.c:312
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:299
+#: shell/e-shell-folder-commands.c:317
 #, fuzzy
 msgid "Copy folder"
 msgstr "���������� ��� �������..."
 
-#: shell/e-shell-folder-commands.c:337
+#: shell/e-shell-folder-commands.c:359
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:342
+#: shell/e-shell-folder-commands.c:364
 #, fuzzy
 msgid "Move folder"
 msgstr "���������� ��� �������..."
 
-#: shell/e-shell-folder-commands.c:367
+#: shell/e-shell-folder-commands.c:390
 #, fuzzy, c-format
 msgid ""
 "Cannot delete folder:\n"
 "%s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: shell/e-shell-folder-commands.c:383
+#: shell/e-shell-folder-commands.c:406
 #, fuzzy, c-format
-msgid "Delete folder '%s'"
+msgid "Delete \"%s\""
 msgstr "�������� �������� ���������"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:393
+#: shell/e-shell-folder-commands.c:416
 #, c-format
-msgid "Are you sure you want to remove the '%s' folder?"
+msgid "Are you sure you want to remove the \"%s\" folder?"
 msgstr ""
 
-#. Popup a dialog asking what the user would like to rename
-#. the folder to
-#: shell/e-shell-folder-commands.c:468
+#: shell/e-shell-folder-commands.c:470
 #, fuzzy, c-format
-msgid "Rename folder '%s'"
+msgid ""
+"Cannot rename folder:\n"
+"%s"
 msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#: shell/e-shell-folder-commands.c:472
-#, fuzzy
-msgid "Rename"
-msgstr "����������� ������"
+#: shell/e-shell-folder-commands.c:503
+#, fuzzy, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "���������� ��� ��������� ���� ����������� �������"
 
-#. Make, pack the label
-#: shell/e-shell-folder-commands.c:480
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: shell/e-shell-folder-commands.c:506
 #, fuzzy
-msgid "Folder name:"
-msgstr "����������� ������"
+msgid "Rename folder"
+msgstr "���������� ��� ��������� ���� ����������� �������"
 
 #: shell/e-shell-folder-creation-dialog.c:111
 #, fuzzy, c-format
@@ -11674,13 +11786,13 @@ msgstr ""
 msgid "Evolution - Create new folder"
 msgstr "�� Evolution �� ������ �� ������������ ���� �������� ���������"
 
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:99
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:348
+#: shell/e-shell-folder-selection-dialog.c:360
 #, fuzzy
 msgid "New..."
 msgstr "_���"
@@ -11689,7 +11801,11 @@ msgstr "_���"
 msgid "(Untitled)"
 msgstr ""
 
-#: shell/e-shell-importer.c:102
+#: shell/e-shell-importer.c:141
+msgid "Choose the type of importer to run"
+msgstr ""
+
+#: shell/e-shell-importer.c:144
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -11698,9 +11814,13 @@ msgid ""
 "to work it out."
 msgstr ""
 
+#: shell/e-shell-importer.c:150
+msgid "Please select the information that you would like to import"
+msgstr ""
+
 #. Importer isn't ready yet.
 #. Wait 5 seconds and try again.
-#: shell/e-shell-importer.c:197
+#: shell/e-shell-importer.c:242
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11708,86 +11828,109 @@ msgid ""
 "Waiting 5 seconds to retry."
 msgstr ""
 
-#: shell/e-shell-importer.c:217 shell/e-shell-importer.c:248
+#: shell/e-shell-importer.c:262 shell/e-shell-importer.c:293
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:351
+#: shell/e-shell-importer.c:396
 #, c-format
 msgid "File %s does not exist"
 msgstr ""
 
-#: shell/e-shell-importer.c:363
+#: shell/e-shell-importer.c:408
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:378
+#: shell/e-shell-importer.c:423
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-importer.c:388
+#: shell/e-shell-importer.c:433
 msgid "Importing"
 msgstr ""
 
-#: shell/e-shell-importer.c:396
+#: shell/e-shell-importer.c:441
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:454
 #, fuzzy, c-format
 msgid "Error starting %s"
 msgstr "�������� �������� ���������"
 
-#: shell/e-shell-importer.c:428
+#: shell/e-shell-importer.c:473
 #, fuzzy, c-format
 msgid "Error loading %s"
 msgstr "�������� �������� ���������"
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:490
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:560
 msgid "Automatic"
 msgstr ""
 
-#: shell/e-shell-importer.c:566
+#: shell/e-shell-importer.c:611
 #, fuzzy
 msgid "Filename:"
 msgstr "����������� ������"
 
-#: shell/e-shell-importer.c:571
+#: shell/e-shell-importer.c:616
 #, fuzzy
 msgid "Select a file"
 msgstr "�����_����� �����������"
 
-#: shell/e-shell-importer.c:581
+#: shell/e-shell-importer.c:626
 #, fuzzy
 msgid "File type:"
 msgstr "������ ������������"
 
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:651
+msgid "Import data and settings from older programs"
+msgstr ""
+
+#: shell/e-shell-importer.c:655
+msgid "Import a single file"
+msgstr ""
+
+#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:582
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:585
+msgid "Starting Intelligent Importers"
+msgstr ""
+
+#: shell/e-shell-importer.c:840 shell/e-shell-startup-wizard.c:703
+#, fuzzy, c-format
+msgid "From %s:"
+msgstr "���"
+
+#: shell/e-shell-importer.c:1003
 #, fuzzy
 msgid "Select folder"
 msgstr "_���� ��������"
 
-#: shell/e-shell-importer.c:646
+#: shell/e-shell-importer.c:1004
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:689 shell/importer/intelligent.c:194
+#: shell/e-shell-importer.c:1116 shell/importer/intelligent.c:194
 msgid "Import"
 msgstr ""
 
@@ -11807,74 +11950,68 @@ msgstr ""
 msgid "Cannot initialize the Evolution Mailer Wizard interface"
 msgstr "������������� ��� ���������� ������� Bonobo ����������"
 
-#: shell/e-shell-startup-wizard.c:582
-msgid ""
-"Please wait...\n"
-"Scanning for existing setups"
-msgstr ""
-
-#: shell/e-shell-startup-wizard.c:585
-msgid "Starting Intelligent Importers"
-msgstr ""
-
-#: shell/e-shell-startup-wizard.c:703
-#, fuzzy, c-format
-msgid "From %s:"
-msgstr "���"
-
 #: shell/e-shell-startup-wizard.c:745
 msgid ""
 "Please select the information\n"
 "that you would like to import"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:183
+#: shell/e-shell-view-menu.c:201
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:191
+#: shell/e-shell-view-menu.c:209
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:217
+#: shell/e-shell-view-menu.c:235
 #, fuzzy
 msgid "Ximian Evolution"
 msgstr "�_����� ������������ ��� Evolution"
 
-#: shell/e-shell-view-menu.c:219
+#: shell/e-shell-view-menu.c:237
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:221
+#: shell/e-shell-view-menu.c:239
 msgid ""
 "Ximian Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
 "within the GNOME desktop environment."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:424
+#: shell/e-shell-view-menu.c:442
 #, fuzzy
 msgid "Go to folder..."
 msgstr "���������� ��� �������..."
 
-#: shell/e-shell-view-menu.c:425
+#: shell/e-shell-view-menu.c:443
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:570
+#: shell/e-shell-view-menu.c:563
 #, fuzzy
 msgid "Create a new shortcut"
 msgstr "���������� ��� �������..."
 
-#: shell/e-shell-view-menu.c:571
+#: shell/e-shell-view-menu.c:564
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:685
+#: shell/e-shell-view-menu.c:595
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:603
+#, fuzzy, c-format
+msgid "Error executing %s."
+msgstr "���������� ��� ��������� ���� ����������� �������"
+
+#: shell/e-shell-view-menu.c:705
 msgid "Work Online"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:698 shell/e-shell-view-menu.c:711
+#: shell/e-shell-view-menu.c:718 shell/e-shell-view-menu.c:731
 #: ui/evolution.xml.h:30
 msgid "Work Offline"
 msgstr ""
@@ -11883,69 +12020,69 @@ msgstr ""
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:1478
+#: shell/e-shell-view.c:1512
 #, c-format
 msgid "%s (%d)"
 msgstr ""
 
-#: shell/e-shell-view.c:1480
+#: shell/e-shell-view.c:1514
 #, fuzzy
 msgid "(None)"
 msgstr "������_��"
 
-#: shell/e-shell-view.c:1485
+#: shell/e-shell-view.c:1519
 #, c-format
 msgid "%s - Ximian Evolution %s"
 msgstr ""
 
-#: shell/e-shell-view.c:1487
+#: shell/e-shell-view.c:1521
 #, c-format
 msgid "%s - Ximian Evolution %s [%s]"
 msgstr ""
 
-#: shell/e-shell-view.c:1527
+#: shell/e-shell-view.c:1561
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1534
+#: shell/e-shell-view.c:1568
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1540
+#: shell/e-shell-view.c:1574
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:560
+#: shell/e-shell.c:562
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1496
+#: shell/e-shell.c:1488
 #, c-format
 msgid ""
 "Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
 "This probably means that the %s component has crashed."
 msgstr ""
 
-#: shell/e-shell.c:1700 widgets/misc/e-cell-date-edit.c:248
+#: shell/e-shell.c:1692 widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr ""
 
-#: shell/e-shell.c:1702
+#: shell/e-shell.c:1694
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:1704
+#: shell/e-shell.c:1696
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:1706
+#: shell/e-shell.c:1698
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:1708 shell/e-storage.c:491
+#: shell/e-shell.c:1700 shell/e-storage.c:496
 msgid "Generic error"
 msgstr ""
 
@@ -12088,51 +12225,58 @@ msgstr "������ ������������"
 msgid "Shortcuts"
 msgstr "�������� ��� ������ ������������"
 
+#: shell/e-storage-set-view.c:645
+#, fuzzy, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr "���������� ��� ��������� ���� ����������� �������"
+
 #: shell/e-storage.c:182 shell/e-storage.c:188
 msgid "(No name)"
 msgstr ""
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:494
 msgid "No error"
 msgstr ""
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:498
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:500
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:502
 msgid "I/O error"
 msgstr ""
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:504
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:506
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:503
+#: shell/e-storage.c:508
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:512
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:514
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:516
 msgid "The specified folder cannot be modified or removed"
 msgstr ""
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:518
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
@@ -12163,6 +12307,11 @@ msgstr ""
 msgid "The following connections are currently active:"
 msgstr ""
 
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#, fuzzy
+msgid "Folder name:"
+msgstr "����������� ������"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 #, fuzzy
 msgid "Folder type:"
@@ -12217,15 +12366,25 @@ msgid "Evolution Importer Assistant"
 msgstr "�_����� ������������ ��� Evolution"
 
 #: shell/importer/import.glade.h:4
-msgid "Import File (Step 2 of 2)"
-msgstr ""
+#, fuzzy
+msgid "Import File (step 3 of 3)"
+msgstr "�����_����� �����������"
 
 #: shell/importer/import.glade.h:5
+msgid "Importer Type (step 1 of 3)"
+msgstr ""
+
+#: shell/importer/import.glade.h:6
 #, fuzzy
-msgid "Select a File (step 1 of 2)"
+msgid "Select Importers (step 2 of 3)"
 msgstr "�����_����� �����������"
 
-#: shell/importer/import.glade.h:6
+#: shell/importer/import.glade.h:7
+#, fuzzy
+msgid "Select a File (step 2 of 3)"
+msgstr "�����_����� �����������"
+
+#: shell/importer/import.glade.h:8
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of\n"
@@ -12451,13 +12610,6 @@ msgstr "������ ������������"
 msgid "_Select All"
 msgstr "_���� ��������"
 
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:44
-#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
-#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:19
-#: ui/my-evolution.xml.h:9
-msgid "_Tools"
-msgstr "�_�������"
-
 #: ui/evolution-calendar.xml.h:2
 msgid "Configure the calendar's settings"
 msgstr ""
@@ -12654,8 +12806,8 @@ 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:49
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:36
 #, fuzzy
 msgid "_File"
@@ -12679,8 +12831,8 @@ msgstr ""
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:54
-#: ui/evolution-signature-editor.xml.h:11
+#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-signature-editor.xml.h:10
 #, fuzzy
 msgid "_Save"
 msgstr "����������"
@@ -13368,6 +13520,11 @@ msgstr ""
 msgid "_Open Message"
 msgstr "����������� ��������"
 
+#: ui/evolution-mail-message.xml.h:98 ui/evolution.xml.h:49
+#: ui/my-evolution.xml.h:9
+msgid "_Tools"
+msgstr "�_�������"
+
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 #, fuzzy
 msgid "Close this window"
@@ -13380,8 +13537,8 @@ msgstr "�������� �������� ���������"
 msgid "_Close"
 msgstr ""
 
-#: ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:48
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:50
 #, fuzzy
 msgid "_View"
 msgstr "_���"
@@ -13564,38 +13721,33 @@ msgid "_Cc Field"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:46
-#: ui/evolution-signature-editor.xml.h:6
-msgid "_Debug"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:47
 #, fuzzy
 msgid "_Delete all"
 msgstr "_���� ��������"
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:49
 msgid "_From Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:51
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-signature-editor.xml.h:9
 msgid "_Insert"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:51
 #, fuzzy
 msgid "_Open..."
 msgstr "����_���"
 
-#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Reply-To Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:55
+#: ui/evolution-message-composer.xml.h:54
 msgid "_Security"
 msgstr ""
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution.xml.h:40
 #, fuzzy
 msgid "_Help"
 msgstr "������_��"
@@ -13746,7 +13898,7 @@ msgid "Exit the program"
 msgstr ""
 
 #: ui/evolution.xml.h:15
-msgid "Import an external file format"
+msgid "Import data from other programs"
 msgstr ""
 
 #: ui/evolution.xml.h:17
@@ -13831,7 +13983,7 @@ msgstr "���������� ��� �������..."
 
 #: ui/evolution.xml.h:41
 #, fuzzy
-msgid "_Import File..."
+msgid "_Import..."
 msgstr "���������"
 
 #: ui/evolution.xml.h:42
@@ -13850,20 +14002,25 @@ msgstr "_���� ��������"
 
 #: ui/evolution.xml.h:45
 #, fuzzy
+msgid "_Pilot Settings..."
+msgstr "�_��������"
+
+#: ui/evolution.xml.h:46
+#, fuzzy
 msgid "_Rename..."
 msgstr "����_���"
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:47
 #, fuzzy
 msgid "_Shortcut"
 msgstr "�������� ��� ������ ������������"
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:48
 #, fuzzy
 msgid "_Shortcut Bar"
 msgstr "�������� ��� ������ ������������"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:51
 msgid "_Work Offline"
 msgstr ""
 
@@ -13970,12 +14127,12 @@ msgstr ""
 msgid "%B %Y"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:433
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:439
 #, fuzzy
 msgid "Now"
 msgstr "_���"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:445
 #, fuzzy
 msgid "Today"
 msgstr "������"
@@ -14131,24 +14288,52 @@ msgstr "��� ����������"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr ""
 
-#: wombat/wombat.c:175
+#: wombat/wombat.c:176
 #, fuzzy
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "������ ���/�����: ������������ ��� Bonobo �������"
 
-#: wombat/wombat.c:187
+#: wombat/wombat.c:188
 #, fuzzy
 msgid "init_corba(): could not initialize GNOME"
 msgstr "������ ���/�����: ������������ ��� Bonobo �������"
 
-#: wombat/wombat.c:200
+#: wombat/wombat.c:201
 #, fuzzy
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "������ ���/�����: ������������ ��� Bonobo �������"
 
 #, fuzzy
-#~ msgid "Cannot open folder: %s: No such folder"
-#~ msgstr "���������� ��� ��������� ���� ����������� �������"
+#~ msgid "_Calendar Information:"
+#~ msgstr "�_����� ������������ ��� Evolution"
+
+#, fuzzy
+#~ msgid "before start of appointment"
+#~ msgstr "�������� �������� ���������"
+
+#, fuzzy
+#~ msgid "after start of appointment"
+#~ msgstr "�������� �������� ���������"
+
+#, fuzzy
+#~ msgid "before end of appointment"
+#~ msgstr "�������� �������� ���������"
+
+#, fuzzy
+#~ msgid "Evolution Shortcuts"
+#~ msgstr "�_����� ������������ ��� Evolution"
+
+#, fuzzy
+#~ msgid "Delete folder '%s'"
+#~ msgstr "�������� �������� ���������"
+
+#, fuzzy
+#~ msgid "Rename"
+#~ msgstr "����������� ������"
+
+#, fuzzy
+#~ msgid "_Import File..."
+#~ msgstr "���������"
 
 #, fuzzy
 #~ msgid "Factory for the Evolution addressbook component."
@@ -14319,10 +14504,6 @@ msgstr "������ ���/�����: ������������ ��� Bonobo �������"
 #~ msgstr "����������� ��������"
 
 #, fuzzy
-#~ msgid "Delegate Task"
-#~ msgstr "�������� �������� ���������"
-
-#, fuzzy
 #~ msgid "Getting _Started"
 #~ msgstr "��_���� ����������"
 
@@ -14445,10 +14626,6 @@ msgstr "������ ���/�����: ������������ ��� Bonobo �������"
 #~ msgstr "���������� ��� �������..."
 
 #, fuzzy
-#~ msgid "Copying messages"
-#~ msgstr "����������� ��������"
-
-#, fuzzy
 #~ msgid "[%s] (forwarded message)"
 #~ msgstr "�������� �������� ���������"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 8df15549cb..6d29e5e935 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: 2001-09-21 18:31-0400\n"
+"POT-Creation-Date: 2001-10-01 19:06-0400\n"
 "PO-Revision-Date: 2000-10-22 16:19+0100\n"
 "Last-Translator: Robert Brady <rwb197@zepler.org>\n"
 "Language-Team: \n"
@@ -31,277 +31,277 @@ msgid "Name"
 msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-msgid "Family Name"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card-simple.c:61
 #: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Email"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:61
 #: addressbook/gui/contact-editor/e-contact-editor.c:1609
 msgid "Primary"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:61
 msgid "Prim"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:92
 #: addressbook/gui/contact-editor/e-contact-editor.c:1594
 #: addressbook/gui/widgets/e-addressbook-view.c:902
 msgid "Assistant"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/gui/contact-editor/e-contact-editor.c:1595
 #: addressbook/gui/contact-editor/e-contact-editor.c:1662
 msgid "Business"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/backend/ebook/e-card-simple.c:68
 msgid "Bus"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/gui/contact-editor/e-contact-editor.c:1598
 msgid "Callback"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/gui/contact-editor/e-contact-editor.c:1600
 msgid "Company"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:65
 #, fuzzy
 msgid "Comp"
 msgstr "Colours"
 
-#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:69
 #: addressbook/gui/contact-editor/e-contact-editor.c:1601
 #: addressbook/gui/contact-editor/e-contact-editor.c:1663
 msgid "Home"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:67
 #: addressbook/gui/widgets/e-addressbook-view.c:877
 msgid "Organization"
 msgstr "Organisation"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:67
 msgid "Org"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/e-contact-editor.c:1605
 msgid "Mobile"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/e-contact-editor.c:1599
 msgid "Car"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/e-contact-editor.c:1597
 #: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "Business Fax"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/backend/ebook/e-card-simple.c:72
 msgid "Bus Fax"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/backend/ebook/e-card-simple.c:73
 #: addressbook/gui/contact-editor/e-contact-editor.c:1603
 #: addressbook/gui/widgets/e-addressbook-view.c:883
 msgid "Home Fax"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/e-contact-editor.c:1596
 msgid "Business 2"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/backend/ebook/e-card-simple.c:74
 msgid "Bus 2"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/backend/ebook/e-card-simple.c:75
 #: addressbook/gui/contact-editor/e-contact-editor.c:1602
 msgid "Home 2"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/backend/ebook/e-card-simple.c:76
 #: addressbook/gui/contact-editor/e-contact-editor.c:1604
 #: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "ISDN"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/backend/ebook/e-card-simple.c:83
 #: addressbook/gui/contact-editor/e-contact-editor.c:1606
 #: addressbook/gui/contact-editor/e-contact-editor.c:1664
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:52
 msgid "Other"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/backend/ebook/e-card-simple.c:78
 #: addressbook/gui/contact-editor/e-contact-editor.c:1607
 #: addressbook/gui/widgets/e-addressbook-view.c:888
 msgid "Other Fax"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/gui/contact-editor/e-contact-editor.c:1608
 #: addressbook/gui/widgets/e-addressbook-view.c:889
 msgid "Pager"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/backend/ebook/e-card-simple.c:80
 #: addressbook/gui/contact-editor/e-contact-editor.c:1610
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 msgid "Radio"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/backend/ebook/e-card-simple.c:81
 #: addressbook/gui/contact-editor/e-contact-editor.c:1611
 #: addressbook/gui/widgets/e-addressbook-view.c:891
 msgid "Telex"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/backend/ebook/e-card-simple.c:82
 #: addressbook/gui/widgets/e-addressbook-view.c:892
 msgid "TTY"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/backend/ebook/e-card-simple.c:84
 #: addressbook/gui/component/e-address-popup.c:476
 #: addressbook/gui/contact-editor/e-contact-editor.c:1637
 #: addressbook/gui/widgets/e-addressbook-view.c:894
 msgid "Email 2"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/backend/ebook/e-card-simple.c:85
 #: addressbook/gui/component/e-address-popup.c:486
 #: addressbook/gui/contact-editor/e-contact-editor.c:1638
 #: addressbook/gui/widgets/e-addressbook-view.c:895
 msgid "Email 3"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/widgets/e-addressbook-view.c:896
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:86
 msgid "Url"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/widgets/e-addressbook-view.c:897
 msgid "Department"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:87
 msgid "Dep"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/backend/ebook/e-card-simple.c:88
 #: addressbook/gui/widgets/e-addressbook-view.c:898
 msgid "Office"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/backend/ebook/e-card-simple.c:88
 msgid "Off"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card-simple.c:89
 #: addressbook/gui/widgets/e-addressbook-view.c:899
 msgid "Title"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:90
 #: addressbook/gui/widgets/e-addressbook-view.c:900
 msgid "Profession"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Prof"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:91
 #: addressbook/gui/widgets/e-addressbook-view.c:901
 msgid "Manager"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:91
 msgid "Man"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:92
 msgid "Ass"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card-simple.c:93
 #: addressbook/gui/widgets/e-addressbook-view.c:903
 msgid "Nickname"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card-simple.c:93
 msgid "Nick"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/backend/ebook/e-card-simple.c:94
 #: addressbook/gui/widgets/e-addressbook-view.c:904
 msgid "Spouse"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card-simple.c:95
 #: addressbook/gui/widgets/e-addressbook-view.c:905
 msgid "Note"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:96
 msgid "Calendar URI"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:96
 msgid "CALUri"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:97
 #: addressbook/gui/widgets/e-addressbook-view.c:906
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:97
 msgid "FBUrl"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "Anniversary"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "Anniv"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card-simple.c:99
 msgid "Birth Date"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:103
+#: addressbook/backend/ebook/e-card-simple.c:102
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr ""
 
+#: addressbook/backend/ebook/e-card-simple.c:103
+msgid "Family Name"
+msgstr ""
+
 #: addressbook/backend/ebook/e-card.c:3564
 msgid "Card: "
 msgstr ""
@@ -533,10 +533,10 @@ msgstr ""
 #: 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:1119
+#: addressbook/conduit/address-conduit.c:1167
 #: addressbook/gui/component/addressbook-factory.c:48
-#: calendar/conduits/calendar/calendar-conduit.c:1204
-#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/conduits/calendar/calendar-conduit.c:1262
+#: calendar/conduits/todo/todo-conduit.c:1034
 #: calendar/gui/alarm-notify/notify-main.c:78 calendar/gui/main.c:63
 msgid "Could not initialize Bonobo"
 msgstr "Could not initialise Bonobo"
@@ -595,20 +595,20 @@ msgstr ""
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:681
-#: calendar/conduits/calendar/calendar-conduit.c:778
-#: calendar/conduits/todo/todo-conduit.c:592
+#: addressbook/conduit/address-conduit.c:731
+#: calendar/conduits/calendar/calendar-conduit.c:837
+#: calendar/conduits/todo/todo-conduit.c:609
 msgid "Could not start wombat server"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:682
-#: calendar/conduits/calendar/calendar-conduit.c:779
-#: calendar/conduits/todo/todo-conduit.c:593
+#: addressbook/conduit/address-conduit.c:732
+#: calendar/conduits/calendar/calendar-conduit.c:838
+#: calendar/conduits/todo/todo-conduit.c:610
 msgid "Could not start wombat"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:714
-#: addressbook/conduit/address-conduit.c:717
+#: addressbook/conduit/address-conduit.c:762
+#: addressbook/conduit/address-conduit.c:765
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -654,8 +654,8 @@ msgid "Factory for the sample Addressbook control"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:66
-#: calendar/gui/dialogs/comp-editor-util.c:281
-#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:173
+#: calendar/gui/dialogs/comp-editor-util.c:289
+#: calendar/gui/dialogs/comp-editor-util.c:345 shell/e-local-storage.c:173
 #: shell/e-shortcuts.c:1062
 msgid "Contacts"
 msgstr ""
@@ -672,20 +672,20 @@ msgstr ""
 msgid "LDAP server containing contact information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:386
+#: addressbook/gui/component/addressbook-component.c:411
 #: ui/evolution-addressbook.xml.h:11
 msgid "New Contact"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:386
+#: addressbook/gui/component/addressbook-component.c:411
 msgid "New _Contact"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:387
+#: addressbook/gui/component/addressbook-component.c:412
 msgid "New Contact List"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:387
+#: addressbook/gui/component/addressbook-component.c:412
 msgid "New Contact _List"
 msgstr ""
 
@@ -785,19 +785,19 @@ msgid "_Account name:"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.glade.h:22
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: 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:90 my-evolution/my-evolution.glade.h:20
+#: mail/mail-config.glade.h:91 my-evolution/my-evolution.glade.h:20
 msgid "_Add"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.glade.h:23
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:95
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:96
 #: ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
 #: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
 msgstr ""
@@ -818,35 +818,35 @@ msgstr ""
 msgid "Other Contacts"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:393
+#: addressbook/gui/component/addressbook.c:407
 #, c-format
 msgid "Please enter your email address and password for access to %s"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:401
+#: addressbook/gui/component/addressbook.c:415
 msgid "LDAP Authentication"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:412
+#: addressbook/gui/component/addressbook.c:426
 msgid "Email Address:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:425
+#: addressbook/gui/component/addressbook.c:439
 msgid "Password:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:488
+#: addressbook/gui/component/addressbook.c:502
 msgid "Unable to open addressbook"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:495
+#: addressbook/gui/component/addressbook.c:509
 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:500
+#: addressbook/gui/component/addressbook.c:514
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -854,43 +854,43 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:508
+#: addressbook/gui/component/addressbook.c:522
 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:649
+#: addressbook/gui/component/addressbook.c:663
 #: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:650
+#: addressbook/gui/component/addressbook.c:664
 msgid "Name contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:665
 msgid "Email contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:652
+#: addressbook/gui/component/addressbook.c:666
 #: calendar/gui/cal-search-bar.c:59
 msgid "Category is"
 msgstr ""
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:653 widgets/misc/e-filter-bar.h:97
+#: addressbook/gui/component/addressbook.c:667 widgets/misc/e-filter-bar.h:97
 #: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:883
+#: addressbook/gui/component/addressbook.c:897
 #: calendar/gui/cal-search-bar.c:412
 msgid "Any Category"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:925
+#: addressbook/gui/component/addressbook.c:939
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
@@ -904,7 +904,7 @@ msgid "(none)"
 msgstr ""
 
 #: addressbook/gui/component/e-address-popup.c:466
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #: addressbook/gui/contact-editor/e-contact-editor.c:1636
 msgid "Primary Email"
 msgstr ""
@@ -1070,118 +1070,125 @@ msgid "Details"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-msgid "File A_s:"
+msgid "F_ree/Busy URL:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:9
-msgid "General"
+msgid "File A_s:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-msgid "New phone type"
+msgid "General"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
+msgid ""
+"If this person publishes free/busy or other calendar information on the "
+"Internet, enter the address\n"
+"of that information here."
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+msgid "New phone type"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "No_tes:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #, fuzzy
 msgid "Organi_zation:"
 msgstr "Organisation:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "Phone Types"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "Wants to receive _HTML mail"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Address..."
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "_Assistant's name:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Birthday:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Business"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-msgid "_Calendar Information:"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 #: calendar/gui/dialogs/event-page.glade.h:12
 #: calendar/gui/dialogs/task-page.glade.h:10
 msgid "_Contacts..."
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:834 filter/filter.glade.h:8
-#: mail/folder-browser.c:1371 mail/mail-config.glade.h:94
+#: mail/folder-browser.c:1406 mail/mail-config.glade.h:95
 #: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Department:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-msgid "_Free/Busy Information:"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Full Name..."
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Home"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Job title:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Manager's Name:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Mobile"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Nickname:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Office:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Profession:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+msgid "_Public Calendar URL:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Spouse:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_This is the mailing address"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Web page address:"
 msgstr ""
 
@@ -2361,7 +2368,7 @@ msgstr ""
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
 #: addressbook/gui/widgets/e-addressbook-view.c:691
 #: addressbook/gui/widgets/e-addressbook-view.c:753
-#: addressbook/gui/widgets/e-addressbook-view.c:1373
+#: addressbook/gui/widgets/e-addressbook-view.c:1422
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr ""
@@ -2415,8 +2422,8 @@ msgid "Success"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1710
-#: shell/e-storage.c:515
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1702
+#: shell/e-storage.c:520
 msgid "Unknown error"
 msgstr ""
 
@@ -2424,7 +2431,7 @@ msgstr ""
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:505
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:510
 msgid "Permission denied"
 msgstr ""
 
@@ -2441,10 +2448,10 @@ msgid "Protocol not supported"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:733 calendar/gui/calendar-model.c:1274
+#: calendar/gui/calendar-model.c:726 calendar/gui/calendar-model.c:1247
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:544
-#: camel/camel-service.c:580
+#: calendar/gui/e-calendar-table.c:461 camel/camel-service.c:598
+#: camel/camel-service.c:634
 msgid "Cancelled"
 msgstr ""
 
@@ -2469,7 +2476,7 @@ msgid "Error removing list"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1248
+#: addressbook/gui/widgets/e-addressbook-view.c:1297
 msgid "Error removing card"
 msgstr ""
 
@@ -2738,8 +2745,8 @@ msgstr ""
 msgid "Print cards"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.c:1112
-#: addressbook/printing/e-contact-print.c:1134
+#: addressbook/printing/e-contact-print.c:1152
+#: addressbook/printing/e-contact-print.c:1174
 msgid "Print card"
 msgstr ""
 
@@ -2748,18 +2755,44 @@ msgstr ""
 msgid "Print envelope"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:735
-#: calendar/conduits/todo/todo-conduit.c:548
+#: calendar/cal-util/cal-util.c:418 calendar/cal-util/cal-util.c:440
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:385 mail/message-list.c:652
+msgid "High"
+msgstr ""
+
+#: calendar/cal-util/cal-util.c:420 calendar/cal-util/cal-util.c:442
+#: calendar/gui/calendar-model.c:1673
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:386 mail/message-list.c:651
+msgid "Normal"
+msgstr ""
+
+#: calendar/cal-util/cal-util.c:422 calendar/cal-util/cal-util.c:444
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:387 mail/message-list.c:650
+msgid "Low"
+msgstr ""
+
+#. An empty string is the same as 'None'.
+#: calendar/cal-util/cal-util.c:438
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:388
+msgid "Undefined"
+msgstr ""
+
+#: calendar/conduits/calendar/calendar-conduit.c:793
+#: calendar/conduits/todo/todo-conduit.c:564
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:839
-#: calendar/conduits/calendar/calendar-conduit.c:842
+#: calendar/conduits/calendar/calendar-conduit.c:896
+#: calendar/conduits/calendar/calendar-conduit.c:899
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:653
-#: calendar/conduits/todo/todo-conduit.c:656
+#: calendar/conduits/todo/todo-conduit.c:668
+#: calendar/conduits/todo/todo-conduit.c:671
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
@@ -2813,45 +2846,45 @@ msgstr ""
 msgid "Factory for the alarm notification service"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:152
 #, c-format
 msgid "Notification about your appointment starting on %s and ending on %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:156
 #, c-format
 msgid "Notification about your appointment starting on %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:161
 #, c-format
 msgid "Notification about your appointment ending on %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:165
 msgid "Notification about your appointment"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:172
 #, c-format
 msgid "Notification about your task starting on %s and ending on %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:176
 #, c-format
 msgid "Notification about your task starting on %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:181
 #, c-format
 msgid "Notification about your task ending on %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:185
 msgid "Notification about your task"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:267
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr ""
 
@@ -2936,7 +2969,7 @@ msgstr "%m/%d/%Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: calendar/gui/calendar-commands.c:467
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1442
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1446
 msgid "%d %B"
 msgstr ""
 
@@ -2945,17 +2978,17 @@ msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:399 calendar/gui/calendar-model.c:1001
-#: calendar/gui/e-calendar-table.c:307
+#: calendar/gui/calendar-model.c:399 calendar/gui/calendar-model.c:994
+#: calendar/gui/e-calendar-table.c:364
 msgid "Private"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:1003
-#: calendar/gui/e-calendar-table.c:308
+#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:996
+#: calendar/gui/e-calendar-table.c:365
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:306
+#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:363
 msgid "Public"
 msgstr ""
 
@@ -2975,67 +3008,48 @@ msgstr ""
 msgid "W"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:538 calendar/gui/calendar-model.c:1183
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:652
-msgid "High"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1185
-#: calendar/gui/calendar-model.c:1700
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:651
-msgid "Normal"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:542 calendar/gui/calendar-model.c:1187
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:650
-msgid "Low"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:573 calendar/gui/calendar-model.c:1220
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/calendar-model.c:566 calendar/gui/calendar-model.c:1193
+#: calendar/gui/e-calendar-table.c:437
 msgid "Free"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:575 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/calendar-model.c:568 calendar/gui/e-calendar-table.c:438
 #: calendar/gui/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:724 calendar/gui/calendar-model.c:1268
+#: calendar/gui/calendar-model.c:717 calendar/gui/calendar-model.c:1241
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:401
+#: calendar/gui/e-calendar-table.c:458
 msgid "Not Started"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:727 calendar/gui/calendar-model.c:1270
+#: calendar/gui/calendar-model.c:720 calendar/gui/calendar-model.c:1243
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:402
+#: calendar/gui/e-calendar-table.c:459
 msgid "In Progress"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:730 calendar/gui/calendar-model.c:1272
+#: calendar/gui/calendar-model.c:723 calendar/gui/calendar-model.c:1245
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-meeting-model.c:298
+#: calendar/gui/e-calendar-table.c:460 calendar/gui/e-meeting-model.c:298
 #: calendar/gui/e-meeting-model.c:321
 msgid "Completed"
 msgstr ""
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:915 e-util/e-time-utils.c:163
+#: calendar/gui/calendar-model.c:908 e-util/e-time-utils.c:163
 #: e-util/e-time-utils.c:354
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:918 e-util/e-time-utils.c:158
+#: calendar/gui/calendar-model.c:911 e-util/e-time-utils.c:158
 #: e-util/e-time-utils.c:363
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:923
+#: calendar/gui/calendar-model.c:916
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -3043,54 +3057,43 @@ msgid ""
 "%s"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1087
+#: calendar/gui/calendar-model.c:1080
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1127
+#: calendar/gui/calendar-model.c:1120
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1168
-msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
-msgstr ""
-
-#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1181
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:331
-msgid "Undefined"
-msgstr ""
-
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1266 calendar/gui/dialogs/meeting-page.c:332
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1444
+#: calendar/gui/calendar-model.c:1239 calendar/gui/dialogs/meeting-page.c:332
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1446
 #: mail/mail-accounts.c:143 mail/mail-accounts.c:390
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:50
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:203
-#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
-#: widgets/misc/e-dateedit.c:1428 widgets/misc/e-dateedit.c:1543
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:453
+#: widgets/misc/e-dateedit.c:1453 widgets/misc/e-dateedit.c:1568
 msgid "None"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1702
+#: calendar/gui/calendar-model.c:1675
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1704
+#: calendar/gui/calendar-model.c:1677
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1710 calendar/gui/e-meeting-model.c:270
+#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:270
 #: calendar/gui/e-meeting-model.c:280 calendar/gui/e-meeting-model.c:506
 #: calendar/gui/e-meeting-model.c:702
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1710 calendar/gui/e-meeting-model.c:282
+#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:282
 #: calendar/gui/e-meeting-model.c:703
 msgid "No"
 msgstr ""
@@ -3127,40 +3130,40 @@ msgstr ""
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/component-factory.c:62 my-evolution/my-evolution.glade.h:6
+#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:6
 #: shell/e-local-storage.c:172 shell/e-shortcuts.c:1056
 msgid "Calendar"
 msgstr ""
 
-#: calendar/gui/component-factory.c:63
+#: calendar/gui/component-factory.c:64
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/component-factory.c:67 calendar/gui/print.c:1719
-#: my-evolution/e-summary-tasks.c:215 my-evolution/e-summary-tasks.c:231
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1723
+#: my-evolution/e-summary-tasks.c:237 my-evolution/e-summary-tasks.c:253
 #: shell/e-local-storage.c:178 shell/e-shortcuts.c:1059
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr ""
 
-#: calendar/gui/component-factory.c:68
+#: calendar/gui/component-factory.c:69
 msgid "Folder containing to-do items"
 msgstr ""
 
-#: calendar/gui/component-factory.c:593 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:581 ui/evolution-calendar.xml.h:7
 msgid "Create a new appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:594 calendar/gui/e-day-view.c:3420
+#: calendar/gui/component-factory.c:582 calendar/gui/e-day-view.c:3422
 msgid "New _Appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:599 ui/evolution-calendar.xml.h:8
+#: calendar/gui/component-factory.c:587 ui/evolution-calendar.xml.h:8
 #: ui/evolution-tasks.xml.h:5
 msgid "Create a new task"
 msgstr ""
 
-#: calendar/gui/component-factory.c:600
+#: calendar/gui/component-factory.c:588
 msgid "New _Task"
 msgstr ""
 
@@ -3234,93 +3237,117 @@ msgstr ""
 msgid "minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:303
+#: calendar/gui/dialogs/alarm-page.c:307
 #, c-format
 msgid "%d days"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:305
+#: calendar/gui/dialogs/alarm-page.c:310
 msgid "1 day"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:308
+#: calendar/gui/dialogs/alarm-page.c:315
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:310
+#: calendar/gui/dialogs/alarm-page.c:318
 msgid "1 week"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:313
+#: calendar/gui/dialogs/alarm-page.c:323
 #, c-format
 msgid "%d hours"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:315
+#: calendar/gui/dialogs/alarm-page.c:326
 msgid "1 hour"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:318
+#: calendar/gui/dialogs/alarm-page.c:331
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:320
+#: calendar/gui/dialogs/alarm-page.c:334
 msgid "1 minute"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:323
+#: calendar/gui/dialogs/alarm-page.c:339
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:325
+#: calendar/gui/dialogs/alarm-page.c:342
 msgid "1 second"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:350
+#: calendar/gui/dialogs/alarm-page.c:373
 #: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:354
+#: calendar/gui/dialogs/alarm-page.c:377
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 msgid "Display a message"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:358
+#: calendar/gui/dialogs/alarm-page.c:381
 msgid "Send an email"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:362
+#: calendar/gui/dialogs/alarm-page.c:385
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:368 calendar/gui/dialogs/alarm-page.c:404
-#: calendar/gui/e-meeting-model.c:226 calendar/gui/e-meeting-model.c:261
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:674
-#: calendar/gui/e-meeting-model.c:690
-#: camel/providers/smtp/camel-smtp-transport.c:224
-#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
-msgid "Unknown"
+#: calendar/gui/dialogs/alarm-page.c:391
+msgid "Unknown action to be performed"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:403
+#, c-format
+msgid "%s %s before the start of the appointment"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:406
+#, c-format
+msgid "%s %s after the start of the appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:380
-msgid "before start of appointment"
+#: calendar/gui/dialogs/alarm-page.c:411
+#, c-format
+msgid "%s at the start of the appointment"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:420
+#, c-format
+msgid "%s %s before the end of the appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:383
-msgid "after start of appointment"
+#: calendar/gui/dialogs/alarm-page.c:423
+#, c-format
+msgid "%s %s after the end of the appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:393
-msgid "before end of appointment"
+#: calendar/gui/dialogs/alarm-page.c:428
+#, c-format
+msgid "%s at the end of the appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:396
-msgid "after end of appointment"
+#: calendar/gui/dialogs/alarm-page.c:439
+#, c-format
+msgid "%s at an unknown time"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:445
+#, c-format
+msgid "%s at %s"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:452
+#, c-format
+msgid "%s for an unknown trigger type"
 msgstr ""
 
 #: calendar/gui/dialogs/alarm-page.glade.h:1
@@ -3639,108 +3666,108 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:159 calendar/gui/print.c:2128
+#: calendar/gui/dialogs/comp-editor-util.c:167 calendar/gui/print.c:2132
 msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:163 calendar/gui/print.c:2132
+#: calendar/gui/dialogs/comp-editor-util.c:171 calendar/gui/print.c:2136
 msgid " (Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:165 calendar/gui/print.c:2134
+#: calendar/gui/dialogs/comp-editor-util.c:173 calendar/gui/print.c:2138
 msgid "Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:170 calendar/gui/print.c:2139
+#: calendar/gui/dialogs/comp-editor-util.c:178 calendar/gui/print.c:2143
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2141
+#: calendar/gui/dialogs/comp-editor-util.c:180 calendar/gui/print.c:2145
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:515
+#: calendar/gui/dialogs/comp-editor.c:521
 msgid "Edit Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:520
+#: calendar/gui/dialogs/comp-editor.c:526
 #, c-format
 msgid "Appointment - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:523
+#: calendar/gui/dialogs/comp-editor.c:529
 #, c-format
 msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:526
+#: calendar/gui/dialogs/comp-editor.c:532
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:540
+#: calendar/gui/dialogs/comp-editor.c:546
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:950 mail/mail-callbacks.c:1662
+#: calendar/gui/dialogs/comp-editor.c:952 mail/mail-callbacks.c:1671
 #: mail/mail-display.c:100
 msgid "Overwrite file?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:954 mail/mail-callbacks.c:1668
+#: calendar/gui/dialogs/comp-editor.c:956 mail/mail-callbacks.c:1677
 #: mail/mail-display.c:104
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1017 ui/evolution-comp-editor.xml.h:13
+#: calendar/gui/dialogs/comp-editor.c:1019 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1170
+#: calendar/gui/dialogs/comp-editor.c:1172
 msgid "Unable to obtain current version!"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:90
+#: calendar/gui/dialogs/delete-comp.c:91
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:93
+#: calendar/gui/dialogs/delete-comp.c:94
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:100
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:102
+#: calendar/gui/dialogs/delete-comp.c:103
 msgid "Are you sure you want to delete this untitled task?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:109
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:111
+#: calendar/gui/dialogs/delete-comp.c:112
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:126
+#: calendar/gui/dialogs/delete-comp.c:127
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:131
+#: calendar/gui/dialogs/delete-comp.c:132
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:136
+#: calendar/gui/dialogs/delete-comp.c:137
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr ""
@@ -3921,7 +3948,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:18
-#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:85
+#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:86
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr ""
@@ -3946,8 +3973,8 @@ msgstr ""
 msgid "_Other Organizer"
 msgstr "Organisation:"
 
-#: calendar/gui/dialogs/recurrence-page.c:422 calendar/gui/print.c:1851
-#: calendar/gui/print.c:1853 calendar/gui/print.c:1854
+#: calendar/gui/dialogs/recurrence-page.c:422 calendar/gui/print.c:1855
+#: calendar/gui/print.c:1857 calendar/gui/print.c:1858
 msgid "%a %b %d %Y"
 msgstr ""
 
@@ -4066,7 +4093,7 @@ msgid "Progress"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:910
+#: my-evolution/e-summary-preferences.c:949
 msgid "URL:"
 msgstr ""
 
@@ -4085,7 +4112,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/task-page.glade.h:4
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:28
 msgid "Description:"
 msgstr ""
 
@@ -4101,105 +4128,105 @@ msgstr ""
 msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:350
+#: calendar/gui/e-calendar-table.c:407
 #, c-format
 msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:351
+#: calendar/gui/e-calendar-table.c:408
 #, c-format
 msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:409
 #, c-format
 msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:410
 #, c-format
 msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:411
 #, c-format
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:412
 #, c-format
 msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:356
+#: calendar/gui/e-calendar-table.c:413
 #, c-format
 msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:357
+#: calendar/gui/e-calendar-table.c:414
 #, c-format
 msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:358
+#: calendar/gui/e-calendar-table.c:415
 #, c-format
 msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:359
+#: calendar/gui/e-calendar-table.c:416
 #, c-format
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:360
+#: calendar/gui/e-calendar-table.c:417
 #, c-format
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3441
-#: calendar/gui/e-week-view.c:3288 mail/folder-browser.c:1336
+#: calendar/gui/e-calendar-table.c:914 calendar/gui/e-day-view.c:3443
+#: calendar/gui/e-week-view.c:3296 mail/folder-browser.c:1371
 #: shell/e-shortcuts-view.c:385
 msgid "_Open"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3450
-#: calendar/gui/e-week-view.c:3297 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:918 calendar/gui/e-day-view.c:3452
+#: calendar/gui/e-week-view.c:3305 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:856 calendar/gui/e-day-view.c:3452
-#: calendar/gui/e-week-view.c:3299 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:920 calendar/gui/e-day-view.c:3454
+#: calendar/gui/e-week-view.c:3307 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:14
 msgid "_Copy"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3427
-#: calendar/gui/e-day-view.c:3454 calendar/gui/e-week-view.c:3275
-#: calendar/gui/e-week-view.c:3301 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:922 calendar/gui/e-day-view.c:3429
+#: calendar/gui/e-day-view.c:3456 calendar/gui/e-week-view.c:3283
+#: calendar/gui/e-week-view.c:3309 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:40 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:17
 msgid "_Paste"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:863
+#: calendar/gui/e-calendar-table.c:927
 msgid "_Mark as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:865
+#: calendar/gui/e-calendar-table.c:929
 msgid "_Delete this Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:868
+#: calendar/gui/e-calendar-table.c:932
 msgid "_Mark Tasks as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:870
+#: calendar/gui/e-calendar-table.c:934
 msgid "_Delete Selected Tasks"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1130
+#: calendar/gui/e-calendar-table.c:1194
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr ""
@@ -4208,8 +4235,8 @@ msgstr ""
 msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:702
-#: camel/camel-filter-driver.c:819
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:718
+#: camel/camel-filter-driver.c:834
 msgid "Complete"
 msgstr ""
 
@@ -4240,8 +4267,8 @@ 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:30 shell/e-shortcuts.c:1050
-#: shell/e-storage-set-view.c:1424 shell/e-summary-storage.c:80
+#: my-evolution/component-factory.c:45 shell/e-shortcuts.c:1050
+#: shell/e-storage-set-view.c:1420 shell/e-summary-storage.c:80
 msgid "Summary"
 msgstr ""
 
@@ -4261,7 +4288,7 @@ 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:285 calendar/gui/e-day-view.c:1374
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1458
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
 msgid "%A %d %B"
 msgstr ""
 
@@ -4273,273 +4300,289 @@ msgid "%d %b"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:608 calendar/gui/e-week-view.c:344
-#: calendar/gui/print.c:765
+#: calendar/gui/e-day-view.c:608 calendar/gui/e-week-view.c:345
+#: calendar/gui/print.c:769
 msgid "am"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:347
-#: calendar/gui/print.c:767
+#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:348
+#: calendar/gui/print.c:771
 msgid "pm"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3422 calendar/gui/e-week-view.c:3270
+#: calendar/gui/e-day-view.c:3424 calendar/gui/e-week-view.c:3278
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3432 calendar/gui/e-week-view.c:3280
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3288
 #: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3282
+#: calendar/gui/e-day-view.c:3436 calendar/gui/e-week-view.c:3290
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3443 calendar/gui/e-week-view.c:3290
+#: calendar/gui/e-day-view.c:3445 calendar/gui/e-week-view.c:3298
 msgid "_Delete this Appointment"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3462 calendar/gui/e-week-view.c:3315
+#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3323
 msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3317
+#: calendar/gui/e-day-view.c:3466 calendar/gui/e-week-view.c:3325
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3466 calendar/gui/e-week-view.c:3319
+#: calendar/gui/e-day-view.c:3468 calendar/gui/e-week-view.c:3327
 msgid "Delete _All Occurrences"
 msgstr ""
 
+#: calendar/gui/e-itip-control.c:469
+msgid "Meeting begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:474
+msgid "Task begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:479
+msgid "Free/Busy info begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:483
+msgid "Begins: <b>"
+msgstr ""
+
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:677
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:664
+#: calendar/gui/e-itip-control.c:692
 #, c-format
 msgid "<b>Summary:</b> %s<br><br>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:664
+#: calendar/gui/e-itip-control.c:692
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:674
+#: calendar/gui/e-itip-control.c:702
 #, c-format
 msgid "<b>Description:</b> %s"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:737
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:738
 msgid "Meeting Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:715
+#: calendar/gui/e-itip-control.c:742
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:716
+#: calendar/gui/e-itip-control.c:743
 msgid "Meeting Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-itip-control.c:747
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:721
+#: calendar/gui/e-itip-control.c:748
 msgid "Meeting Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:725
+#: calendar/gui/e-itip-control.c:752
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:726
+#: calendar/gui/e-itip-control.c:753
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:730
+#: calendar/gui/e-itip-control.c:757
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:731
+#: calendar/gui/e-itip-control.c:758
 msgid "Meeting Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:735
+#: calendar/gui/e-itip-control.c:762
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:736
+#: calendar/gui/e-itip-control.c:763
 msgid "Meeting Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:740 calendar/gui/e-itip-control.c:788
-#: calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:767 calendar/gui/e-itip-control.c:815
+#: calendar/gui/e-itip-control.c:848
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:741
+#: calendar/gui/e-itip-control.c:768
 msgid "Bad Meeting Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:758
+#: calendar/gui/e-itip-control.c:785
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:759
+#: calendar/gui/e-itip-control.c:786
 msgid "Task Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:763
+#: calendar/gui/e-itip-control.c:790
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:791
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:768
+#: calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:769
+#: calendar/gui/e-itip-control.c:796
 msgid "Task Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:773
+#: calendar/gui/e-itip-control.c:800
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:774
+#: calendar/gui/e-itip-control.c:801
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:778
+#: calendar/gui/e-itip-control.c:805
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:806
 msgid "Task Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:783
+#: calendar/gui/e-itip-control.c:810
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:784
+#: calendar/gui/e-itip-control.c:811
 msgid "Task Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:816
 msgid "Bad Task Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:806
+#: calendar/gui/e-itip-control.c:833
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:807
+#: calendar/gui/e-itip-control.c:834
 msgid "Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:811
+#: calendar/gui/e-itip-control.c:838
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:812
+#: calendar/gui/e-itip-control.c:839
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:816
+#: calendar/gui/e-itip-control.c:843
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:817
+#: calendar/gui/e-itip-control.c:844
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:822
+#: calendar/gui/e-itip-control.c:849
 msgid "Bad Free/Busy Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:889
+#: calendar/gui/e-itip-control.c:916
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:908
+#: calendar/gui/e-itip-control.c:935
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:936 calendar/gui/e-itip-control.c:942
+#: calendar/gui/e-itip-control.c:963 calendar/gui/e-itip-control.c:969
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1088
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1063
+#: calendar/gui/e-itip-control.c:1090
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.c:1134
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1142
 msgid "Attendee status ould not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1144
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1119
+#: calendar/gui/e-itip-control.c:1146
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1174
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-itip-control.c:1176
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1181 calendar/gui/e-itip-control.c:1216
+#: calendar/gui/e-itip-control.c:1208 calendar/gui/e-itip-control.c:1242
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1183 calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1210 calendar/gui/e-itip-control.c:1246
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1380
+#: calendar/gui/e-itip-control.c:1406
 msgid "Unable to find any of your identities in the attendees list!\n"
 msgstr ""
 
@@ -4600,6 +4643,14 @@ msgstr ""
 msgid "Room"
 msgstr ""
 
+#: calendar/gui/e-meeting-model.c:226 calendar/gui/e-meeting-model.c:261
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:674
+#: calendar/gui/e-meeting-model.c:690
+#: camel/providers/smtp/camel-smtp-transport.c:224
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
+msgid "Unknown"
+msgstr ""
+
 #: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
 #: calendar/gui/e-meeting-model.c:686
 msgid "Chair"
@@ -4652,14 +4703,14 @@ msgstr ""
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:472
-#: calendar/gui/e-meeting-time-sel.c:1936
+#: calendar/gui/e-meeting-time-sel.c:1937
 msgid "%A, %B %d, %Y"
 msgstr ""
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:476
-#: calendar/gui/e-meeting-time-sel.c:1964 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:1965 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:345
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
@@ -4667,7 +4718,7 @@ msgstr "%a %d/%m/%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:480 e-util/e-time-utils.c:221
-#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1552
+#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1577
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
@@ -4745,16 +4796,16 @@ msgstr ""
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3268 calendar/gui/e-week-view.c:3306
+#: calendar/gui/e-week-view.c:3276 calendar/gui/e-week-view.c:3314
 msgid "New _Appointment..."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1318
+#: calendar/gui/gnome-cal.c:1319
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1329
+#: calendar/gui/gnome-cal.c:1330
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
@@ -4824,201 +4875,201 @@ msgstr ""
 msgid "Could not create the component editor factory"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "1st"
 msgstr ""
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "2nd"
 msgstr ""
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "3rd"
 msgstr ""
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "4th"
 msgstr ""
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "5th"
 msgstr ""
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "6th"
 msgstr ""
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "7th"
 msgstr ""
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "8th"
 msgstr ""
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "9th"
 msgstr ""
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "10th"
 msgstr ""
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "11th"
 msgstr ""
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "12th"
 msgstr ""
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "13th"
 msgstr ""
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "14th"
 msgstr ""
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "15th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "16th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "17th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "18th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "19th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "20th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "21st"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "22nd"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "23rd"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "24th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "25th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "26th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "27th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "28th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "29th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "30th"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:432
 msgid "31st"
 msgstr ""
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "Su"
 msgstr ""
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "Mo"
 msgstr ""
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "Tu"
 msgstr ""
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "We"
 msgstr ""
 
-#: calendar/gui/print.c:497
+#: calendar/gui/print.c:500
 msgid "Th"
 msgstr ""
 
-#: calendar/gui/print.c:497
+#: calendar/gui/print.c:500
 msgid "Fr"
 msgstr ""
 
-#: calendar/gui/print.c:497
+#: calendar/gui/print.c:500
 msgid "Sa"
 msgstr ""
 
 #. Day
-#: calendar/gui/print.c:1827
+#: calendar/gui/print.c:1831
 msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1846 calendar/gui/print.c:1850
+#: calendar/gui/print.c:1850 calendar/gui/print.c:1854
 msgid "%a %b %d"
 msgstr ""
 
-#: calendar/gui/print.c:1847
+#: calendar/gui/print.c:1851
 msgid "%a %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1858
+#: calendar/gui/print.c:1862
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1866
+#: calendar/gui/print.c:1870
 msgid "Selected month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1873
+#: calendar/gui/print.c:1877
 msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:2214
+#: calendar/gui/print.c:2221
 msgid "Print Calendar"
 msgstr ""
 
-#: calendar/gui/print.c:2302 calendar/gui/print.c:2394
-#: mail/mail-callbacks.c:2071 my-evolution/e-summary.c:551
+#: calendar/gui/print.c:2312 calendar/gui/print.c:2404
+#: mail/mail-callbacks.c:2080 my-evolution/e-summary.c:607
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
 msgstr ""
 
-#: calendar/gui/print.c:2331
+#: calendar/gui/print.c:2341
 msgid "Print Item"
 msgstr ""
 
-#: calendar/gui/print.c:2412
+#: calendar/gui/print.c:2422
 msgid "Print Setup"
 msgstr ""
 
@@ -5202,67 +5253,81 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr ""
 
-#: camel/camel-disco-store.c:305
+#: camel/camel-disco-store.c:336
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
+#: camel/camel-filter-driver.c:549 camel/camel-filter-driver.c:558
 #, fuzzy
 msgid "Syncing folders"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:659
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:668
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:667
+#: camel/camel-filter-driver.c:683
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr ""
 
-#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
+#: camel/camel-filter-driver.c:687 camel/camel-filter-driver.c:700
 #, c-format
 msgid "Failed on message %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:672
+#: camel/camel-filter-driver.c:688
 msgid "Cannot open message"
 msgstr ""
 
-#: camel/camel-filter-driver.c:698 camel/camel-filter-driver.c:814
+#: camel/camel-filter-driver.c:714 camel/camel-filter-driver.c:829
 #, fuzzy
 msgid "Syncing folder"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-filter-driver.c:770
+#: camel/camel-filter-driver.c:786
 #, c-format
 msgid "Getting message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:775 camel/camel-filter-driver.c:793
+#: camel/camel-filter-driver.c:791 camel/camel-filter-driver.c:809
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:900
+#: camel/camel-filter-driver.c:918
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:906
+#: camel/camel-filter-driver.c:924
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-search.c:479 camel/camel-filter-search.c:486
+#: camel/camel-filter-search.c:494 camel/camel-filter-search.c:501
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
 
+#: camel/camel-folder.c:472
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1039
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1219
+msgid "Moving messages"
+msgstr ""
+
 #: camel/camel-folder-search.c:333
 #, c-format
 msgid ""
@@ -5286,7 +5351,7 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:747 camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:748 camel/camel-folder-search.c:792
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
@@ -5385,73 +5450,73 @@ msgstr ""
 msgid "Error copying mail temp file: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:193
+#: camel/camel-pgp-context.c:191
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:196
+#: camel/camel-pgp-context.c:194
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr ""
 
-#: camel/camel-pgp-context.c:518
+#: camel/camel-pgp-context.c:525
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr ""
 
-#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:532 camel/camel-pgp-context.c:706
 msgid "Cannot sign this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:538 camel/camel-pgp-context.c:712
 #, c-format
 msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:693
+#: camel/camel-pgp-context.c:699
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr ""
 
-#: camel/camel-pgp-context.c:886
+#: camel/camel-pgp-context.c:891
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr ""
 
-#: camel/camel-pgp-context.c:892
+#: camel/camel-pgp-context.c:897
 #, c-format
 msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:903
+#: camel/camel-pgp-context.c:908
 #, c-format
 msgid "Cannot verify this message: couldn't create temp file: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1069
+#: camel/camel-pgp-context.c:1076
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1079
+#: camel/camel-pgp-context.c:1086
 msgid "Cannot encrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1086
+#: camel/camel-pgp-context.c:1093
 #, c-format
 msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1095
+#: camel/camel-pgp-context.c:1102
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1258
+#: camel/camel-pgp-context.c:1264
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1266
+#: camel/camel-pgp-context.c:1272
 msgid "Cannot decrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1273
+#: camel/camel-pgp-context.c:1279
 #, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
@@ -5495,13 +5560,13 @@ msgstr ""
 msgid "(unknown host)"
 msgstr ""
 
-#: camel/camel-remote-store.c:361 camel/camel-remote-store.c:423
-#: camel/camel-remote-store.c:486
+#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
+#: camel/camel-remote-store.c:483
 #: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr ""
 
-#: camel/camel-remote-store.c:489
+#: camel/camel-remote-store.c:486
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -5599,7 +5664,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:492
+#: camel/providers/imap/camel-imap-store.c:494
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -5617,7 +5682,7 @@ msgstr ""
 
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:302
-#: camel/providers/pop3/camel-pop3-provider.c:68 mail/mail-config.glade.h:54
+#: camel/providers/pop3/camel-pop3-provider.c:68 mail/mail-config.glade.h:55
 msgid "Password"
 msgstr ""
 
@@ -5646,37 +5711,37 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:154
+#: camel/camel-service.c:157
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:162
+#: camel/camel-service.c:165
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:170
+#: camel/camel-service.c:173
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:548
+#: camel/camel-service.c:602
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:575
+#: camel/camel-service.c:629
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:600
+#: camel/camel-service.c:654
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:602
+#: camel/camel-service.c:656
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
@@ -5689,12 +5754,12 @@ msgstr ""
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:322 camel/camel-session.c:391
+#: camel/camel-session.c:324 camel/camel-session.c:393
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:508
+#: camel/camel-session.c:510
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -5742,7 +5807,7 @@ msgstr ""
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:463
+#: camel/camel-tcp-stream-openssl.c:491
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -5750,7 +5815,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:369
+#: camel/camel-tcp-stream-openssl.c:496 camel/camel-tcp-stream-ssl.c:369
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -5777,17 +5842,37 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr ""
 
-#: camel/camel-vee-folder.c:546
+#: camel/camel-vee-folder.c:554
 #, c-format
 msgid "No such message %s in %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:641
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message: %s"
 msgstr ""
 
-#: camel/camel-vtrash-folder.c:106
+#: camel/camel-vee-store.c:250
+#, fuzzy, c-format
+msgid "Cannot delete folder: %s: Invalid operation"
+msgstr "Synchronising \"%s\""
+
+#: camel/camel-vee-store.c:286
+#, fuzzy, c-format
+msgid "Cannot delete folder: %s: No such folder"
+msgstr "Synchronising \"%s\""
+
+#: camel/camel-vee-store.c:298
+#, fuzzy, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "Synchronising \"%s\""
+
+#: camel/camel-vee-store.c:326
+#, fuzzy, c-format
+msgid "Cannot rename folder: %s: No such folder"
+msgstr "Synchronising \"%s\""
+
+#: camel/camel-vtrash-folder.c:109
 msgid "You cannot copy messages from this trash folder."
 msgstr ""
 
@@ -5835,7 +5920,7 @@ msgid "Scanning for changed messages"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1491
-#: camel/providers/imap/camel-imap-folder.c:1890
+#: camel/providers/imap/camel-imap-folder.c:1899
 msgid "This message is not currently available"
 msgstr ""
 
@@ -5848,7 +5933,7 @@ msgstr ""
 msgid "Scanning for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/imap/camel-imap-folder.c:1936
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -5865,7 +5950,7 @@ msgstr ""
 msgid "Failed to cache message %s: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:14
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:15
 msgid "Checking for new mail"
 msgstr ""
 
@@ -5873,7 +5958,7 @@ msgstr ""
 msgid "Check for new messages in all folders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:733
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:767
 msgid "Folders"
 msgstr ""
 
@@ -5905,28 +5990,28 @@ msgstr ""
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:515
+#: camel/providers/imap/camel-imap-store.c:517
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:525
+#: camel/providers/imap/camel-imap-store.c:527
 #: camel/providers/smtp/camel-smtp-transport.c:388
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap/camel-imap-store.c:551
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:566
 #: camel/providers/smtp/camel-smtp-transport.c:432
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:590
+#: camel/providers/imap/camel-imap-store.c:592
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -5934,12 +6019,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:889
+#: camel/providers/imap/camel-imap-store.c:891
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1090
+#: camel/providers/imap/camel-imap-store.c:1131
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -5971,51 +6056,51 @@ msgstr ""
 msgid "For storing local mail in qmail maildir directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:77
+#: camel/providers/local/camel-local-provider.c:78
 msgid "Standard Unix mbox spools"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:78
+#: camel/providers/local/camel-local-provider.c:79
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:127
-#: camel/providers/local/camel-spool-store.c:112
+#: camel/providers/local/camel-local-store.c:132
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:134
+#: camel/providers/local/camel-local-store.c:139
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:142
-#: camel/providers/local/camel-local-store.c:158
+#: camel/providers/local/camel-local-store.c:147
+#: camel/providers/local/camel-local-store.c:163
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:173
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:183
+#: camel/providers/local/camel-local-store.c:190
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:240
+#: camel/providers/local/camel-local-store.c:247
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:282
+#: camel/providers/local/camel-local-store.c:289
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:292
+#: camel/providers/local/camel-local-store.c:299
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
@@ -6285,26 +6370,26 @@ msgstr ""
 msgid "Cannot append message to spool file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:133
+#: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Spool `%s' does not exist or is not a regular file"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:159
+#: camel/providers/local/camel-spool-store.c:142
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:181
+#: camel/providers/local/camel-spool-store.c:164
 #, c-format
 msgid "Spool mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:227
+#: camel/providers/local/camel-spool-store.c:210
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:235
+#: camel/providers/local/camel-spool-store.c:218
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
@@ -6427,30 +6512,30 @@ msgstr ""
 msgid "Could not check POP server for new messages: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:235
+#: camel/providers/pop3/camel-pop3-folder.c:242
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:259
+#: camel/providers/pop3/camel-pop3-folder.c:266
 msgid "Expunging deleted messages"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:335
+#: camel/providers/pop3/camel-pop3-folder.c:342
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:351
+#: camel/providers/pop3/camel-pop3-folder.c:358
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:374
+#: camel/providers/pop3/camel-pop3-folder.c:381
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:378
+#: camel/providers/pop3/camel-pop3-folder.c:385
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr ""
@@ -6468,7 +6553,7 @@ msgstr ""
 msgid "Delete after %s day(s)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:53
+#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:54
 msgid "POP"
 msgstr ""
 
@@ -6550,7 +6635,7 @@ msgid "Unexpected response from POP server: %s"
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:73
 msgid "Sendmail"
 msgstr ""
 
@@ -6602,7 +6687,7 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:66
 msgid "SMTP"
 msgstr ""
 
@@ -7206,13 +7291,13 @@ msgstr ""
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:309 e-util/e-time-utils.c:396
-#: widgets/misc/e-dateedit.c:1360 widgets/misc/e-dateedit.c:1587
+#: widgets/misc/e-dateedit.c:1385 widgets/misc/e-dateedit.c:1612
 msgid "%I:%M %p"
 msgstr ""
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:313 e-util/e-time-utils.c:388
-#: widgets/misc/e-dateedit.c:1357 widgets/misc/e-dateedit.c:1584
+#: widgets/misc/e-dateedit.c:1382 widgets/misc/e-dateedit.c:1609
 msgid "%H:%M"
 msgstr ""
 
@@ -7351,8 +7436,8 @@ msgid ""
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:232 filter/vfolder-rule.c:351
-#: mail/mail-account-gui.c:820
+#: filter/filter-folder.c:232 filter/vfolder-rule.c:356
+#: mail/mail-account-gui.c:822
 msgid "Select Folder"
 msgstr ""
 
@@ -7600,7 +7685,7 @@ msgstr ""
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1242
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1251
 msgid "Sender"
 msgstr ""
 
@@ -7632,7 +7717,7 @@ msgstr ""
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:893
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:917
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr ""
@@ -7661,7 +7746,7 @@ msgstr ""
 msgid "Score Rules"
 msgstr ""
 
-#: filter/vfolder-rule.c:203
+#: filter/vfolder-rule.c:206
 msgid "Oops.  You need to to specify at least one folder as a source."
 msgstr ""
 
@@ -7679,19 +7764,19 @@ msgstr ""
 msgid "Please wait"
 msgstr ""
 
-#: importers/elm-importer.c:171 importers/netscape-importer.c:701
+#: importers/elm-importer.c:171 importers/netscape-importer.c:708
 #: importers/pine-importer.c:369
 #, c-format
 msgid "Importing %s as %s"
 msgstr ""
 
-#: importers/elm-importer.c:377 importers/netscape-importer.c:794
+#: importers/elm-importer.c:377 importers/netscape-importer.c:801
 #: importers/pine-importer.c:506
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "Synchronise \"%s\""
 
-#: importers/elm-importer.c:528 importers/netscape-importer.c:967
+#: importers/elm-importer.c:528 importers/netscape-importer.c:974
 #: importers/pine-importer.c:669 mail/component-factory.c:96
 msgid "Mail"
 msgstr ""
@@ -7724,20 +7809,20 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: importers/netscape-importer.c:897 importers/pine-importer.c:602
+#: importers/netscape-importer.c:904 importers/pine-importer.c:602
 #, fuzzy
 msgid "Scanning directory"
 msgstr "Synchronising \"%s\""
 
-#: importers/netscape-importer.c:906
+#: importers/netscape-importer.c:913
 msgid "Starting import"
 msgstr ""
 
-#: importers/netscape-importer.c:972
+#: importers/netscape-importer.c:979
 msgid "Settings"
 msgstr ""
 
-#: importers/netscape-importer.c:993
+#: importers/netscape-importer.c:1000
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -7823,19 +7908,25 @@ msgstr ""
 msgid "Change this folder's properties"
 msgstr ""
 
-#: mail/component-factory.c:790
+#: mail/component-factory.c:698
+msgid ""
+"Some of your mail settings seem corrupt, please check that everything is in "
+"order."
+msgstr ""
+
+#: mail/component-factory.c:812
 msgid "New Mail Message"
 msgstr ""
 
-#: mail/component-factory.c:790
+#: mail/component-factory.c:812
 msgid "New _Mail Message"
 msgstr ""
 
-#: mail/component-factory.c:821
+#: mail/component-factory.c:843
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/component-factory.c:1007
+#: mail/component-factory.c:1032
 msgid "Cannot register storage with shell"
 msgstr ""
 
@@ -7848,159 +7939,159 @@ msgstr ""
 msgid "Properties"
 msgstr ""
 
-#: mail/folder-browser.c:239 mail/mail-display.c:275
+#: mail/folder-browser.c:262 mail/mail-display.c:275
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/folder-browser.c:708
+#: mail/folder-browser.c:734
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/folder-browser.c:711 mail/folder-browser.c:716
-#: mail/folder-browser.c:720
+#: mail/folder-browser.c:737 mail/folder-browser.c:742
+#: mail/folder-browser.c:746
 msgid ", "
 msgstr ""
 
-#: mail/folder-browser.c:712
+#: mail/folder-browser.c:738
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/folder-browser.c:717
+#: mail/folder-browser.c:743
 #, c-format
 msgid "%d selected"
 msgstr ""
 
-#: mail/folder-browser.c:722
+#: mail/folder-browser.c:748
 #, c-format
 msgid "%d unsent"
 msgstr ""
 
-#: mail/folder-browser.c:724
+#: mail/folder-browser.c:750
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/folder-browser.c:958
+#: mail/folder-browser.c:993
 msgid "Create vFolder from Search"
 msgstr ""
 
-#: mail/folder-browser.c:1303
+#: mail/folder-browser.c:1338
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/folder-browser.c:1306
+#: mail/folder-browser.c:1341
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:1309
+#: mail/folder-browser.c:1344
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:1312
+#: mail/folder-browser.c:1347
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:1318
+#: mail/folder-browser.c:1353
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/folder-browser.c:1321
+#: mail/folder-browser.c:1356
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/folder-browser.c:1324
+#: mail/folder-browser.c:1359
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/folder-browser.c:1327
+#: mail/folder-browser.c:1362
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1338 ui/evolution-mail-message.xml.h:89
+#: mail/folder-browser.c:1373 ui/evolution-mail-message.xml.h:89
 msgid "_Edit as New Message..."
 msgstr ""
 
-#: mail/folder-browser.c:1340 ui/evolution-mail-message.xml.h:97
+#: mail/folder-browser.c:1375 ui/evolution-mail-message.xml.h:97
 msgid "_Save As..."
 msgstr ""
 
-#: mail/folder-browser.c:1342
+#: mail/folder-browser.c:1377
 msgid "_Print"
 msgstr ""
 
-#: mail/folder-browser.c:1347 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1382 ui/evolution-mail-message.xml.h:96
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/folder-browser.c:1349 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1384 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _List"
 msgstr ""
 
-#: mail/folder-browser.c:1351 ui/evolution-mail-message.xml.h:68
+#: mail/folder-browser.c:1386 ui/evolution-mail-message.xml.h:68
 msgid "Reply to _All"
 msgstr ""
 
-#: mail/folder-browser.c:1353
+#: mail/folder-browser.c:1388
 msgid "_Forward"
 msgstr ""
 
-#: mail/folder-browser.c:1356 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1391 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/folder-browser.c:1358 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1393 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr ""
 
-#: mail/folder-browser.c:1360
+#: mail/folder-browser.c:1395
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/folder-browser.c:1362
+#: mail/folder-browser.c:1397
 msgid "Mark as Unim_portant"
 msgstr ""
 
-#: mail/folder-browser.c:1367
+#: mail/folder-browser.c:1402
 msgid "_Move to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:1369
+#: mail/folder-browser.c:1404
 msgid "_Copy to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:1373 ui/evolution-mail-message.xml.h:99
+#: mail/folder-browser.c:1408 ui/evolution-mail-message.xml.h:99
 msgid "_Undelete"
 msgstr ""
 
-#: mail/folder-browser.c:1378
+#: mail/folder-browser.c:1413
 msgid "Add Sender to Address Book"
 msgstr ""
 
-#: mail/folder-browser.c:1383
+#: mail/folder-browser.c:1418
 msgid "Apply Filters"
 msgstr ""
 
-#: mail/folder-browser.c:1387
+#: mail/folder-browser.c:1422
 msgid "Create Ru_le From Message"
 msgstr ""
 
-#: mail/folder-browser.c:1538
+#: mail/folder-browser.c:1573
 msgid "Filter on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1539
+#: mail/folder-browser.c:1574
 msgid "VFolder on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1541
+#: mail/folder-browser.c:1576
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:1542
+#: mail/folder-browser.c:1577
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr ""
@@ -8071,22 +8162,22 @@ msgstr ""
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:945
+#: mail/mail-account-gui.c:947
 msgid "Could not save signature file."
 msgstr ""
 
-#: mail/mail-account-gui.c:1022
+#: mail/mail-account-gui.c:1024
 msgid "Save signature"
 msgstr ""
 
-#: mail/mail-account-gui.c:1028
+#: mail/mail-account-gui.c:1030
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: mail/mail-account-gui.c:1611
+#: mail/mail-account-gui.c:1615
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -8119,7 +8210,7 @@ msgid "Are you sure you want to delete this news account?"
 msgstr ""
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:757 mail/mail-config.glade.h:42
+#: mail/mail-accounts.c:760 mail/mail-config.glade.h:45
 msgid "Mail Settings"
 msgstr ""
 
@@ -8209,69 +8300,69 @@ msgstr ""
 msgid "This message contains invalid recipients:"
 msgstr ""
 
-#: mail/mail-callbacks.c:453
+#: mail/mail-callbacks.c:454
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:549
+#: mail/mail-callbacks.c:550
 msgid "You must configure an account before you can send this email."
 msgstr ""
 
-#: mail/mail-callbacks.c:779
+#: mail/mail-callbacks.c:783
 msgid "an unknown sender"
 msgstr ""
 
-#: mail/mail-callbacks.c:784
+#: mail/mail-callbacks.c:788
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1162
+#: mail/mail-callbacks.c:1171
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1164
+#: mail/mail-callbacks.c:1173
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1538
+#: mail/mail-callbacks.c:1547
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1560
+#: mail/mail-callbacks.c:1569
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1594
+#: mail/mail-callbacks.c:1603
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1606
+#: mail/mail-callbacks.c:1615
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1627
+#: mail/mail-callbacks.c:1636
 msgid "No Message Selected"
 msgstr ""
 
-#: mail/mail-callbacks.c:1712
+#: mail/mail-callbacks.c:1721
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:1714
+#: mail/mail-callbacks.c:1723
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:1859 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:1868 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr ""
 
-#: mail/mail-callbacks.c:1864
+#: mail/mail-callbacks.c:1873
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8279,30 +8370,30 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1871
+#: mail/mail-callbacks.c:1880
 msgid "Do not ask me again."
 msgstr ""
 
-#: mail/mail-callbacks.c:1976
+#: mail/mail-callbacks.c:1985
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:1986
+#: mail/mail-callbacks.c:1995
 msgid "Filters"
 msgstr ""
 
-#: mail/mail-callbacks.c:2032
+#: mail/mail-callbacks.c:2041
 msgid "Print Message"
 msgstr ""
 
-#: mail/mail-callbacks.c:2078
+#: mail/mail-callbacks.c:2087
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-callbacks.c:2162
+#: mail/mail-callbacks.c:2171
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -8348,87 +8439,106 @@ msgstr ""
 msgid "Evolution Account Assistant"
 msgstr ""
 
-#: mail/mail-config.c:1486
-msgid "Evolution Shortcuts"
+#: mail/mail-config.c:315
+#, c-format
+msgid "Account %d"
 msgstr ""
 
-#. right now, the URL always works basically as a matter of luck...
-#. * both IMAP and mbox spool stores have INBOX as their inbox folder
-#. * name. I don't think this will work with maildir. How can we figure out
-#. * what shortcut to insert?
-#.
 #: mail/mail-config.c:1618
 #, c-format
+msgid ""
+"Could not get inbox for new mail store:\n"
+"%s\n"
+"No shortcut will be created."
+msgstr ""
+
+#. Create the shortcut. FIXME: This only works if the
+#. * full name matches the path.
+#.
+#: mail/mail-config.c:1629
+#, c-format
 msgid "%s: Inbox"
 msgstr ""
 
-#: mail/mail-config.c:1851
+#: mail/mail-config.c:1873
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:1922 mail/mail-config.c:1925
+#: mail/mail-config.c:1944 mail/mail-config.c:1947
 msgid "Connecting to server..."
 msgstr ""
 
 #: mail/mail-config.glade.h:1
+msgid " _Check for supported types "
+msgstr ""
+
+#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid " color"
 msgstr "Colours"
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr ""
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:5 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:6 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "Accounts"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:10
 msgid "Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:10 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:12
 msgid "Authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:13
 msgid "Authentication Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:14
 msgid "Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:16
 #, fuzzy
 msgid "Composer"
 msgstr "Colours"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:17
+msgid "Configuration"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+msgid "Confirm when Expunging a folder"
+msgstr ""
+
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -8438,314 +8548,298 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:26
 msgid "Default Forward style is: "
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:27
 msgid "Default character encoding: "
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:29
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:30
 msgid "Display"
 msgstr ""
 
-#: mail/mail-config.glade.h:27 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:31 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr ""
 
-#: mail/mail-config.glade.h:28 shell/e-local-storage.c:174
+#: mail/mail-config.glade.h:32 shell/e-local-storage.c:174
 msgid "Drafts"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:33
 msgid "Drafts folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:34
 msgid "E_nable"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
-msgid "Each account must have a different name."
-msgstr ""
-
-#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:96
 #: widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr ""
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:36
 msgid "Enabled"
 msgstr ""
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:37
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:38
 msgid "HTML signature file:"
 msgstr ""
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:39
 msgid "IMAPv4 "
 msgstr ""
 
-#: mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:40 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:41
 msgid "In HTML mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:42
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:43
 msgid "Kerberos "
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:44
 msgid "Mail Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:46
 msgid "Mailbox location"
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:47
 msgid "Make this my _default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:45
-msgid "Message _preview should be displayed by default"
-msgstr ""
-
-#: mail/mail-config.glade.h:46
-msgid "Message list should display in a _threaded fashion by default"
-msgstr ""
-
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 msgid "NNTP Server:"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:49
 msgid "News"
 msgstr ""
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:51
 msgid "Optional Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:53
 msgid "PGP Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 msgid "Pick a color"
 msgstr "Pick a colour"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 msgid "Prompt when sending messages with an _empty subject"
 msgstr ""
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:60
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:61
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:63
 msgid "Receiving Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:64
 msgid "Receiving Options"
 msgstr ""
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:65
 msgid "Required Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:67
 msgid "Secure MIME"
 msgstr ""
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:68
 msgid "Security"
 msgstr ""
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:69
 msgid "Select Filter Log file..."
 msgstr ""
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:70
 msgid "Select PGP binary"
 msgstr ""
 
-#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:71 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:72
 msgid "Sending Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:74 mail/message-list.etspec.h:6
 #: shell/e-local-storage.c:177
 msgid "Sent"
 msgstr ""
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:75
 msgid "Sent and Draft Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:76
 msgid "Sent messages folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:77
 msgid "Server Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 msgid "Server Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 msgid "Server requires _authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:80
 msgid "Signature file:"
 msgstr ""
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "Source"
 msgstr ""
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 msgid "Source Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:83
 msgid "Sources"
 msgstr ""
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
 msgid "Special Folders"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:85
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:87
 msgid "Use secure connection (_SSL)"
 msgstr ""
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:88
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:92
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:93
 msgid "_Automatically check for new mail every"
 msgstr ""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:94
 msgid "_Check for supported types"
 msgstr ""
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:97
 msgid "_Email Address:"
 msgstr ""
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:98
 msgid "_Empty trash folders on exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 msgid "_Full Name:"
 msgstr ""
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "_HTML Signature:"
 msgstr ""
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 msgid "_Highlight citations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:102
 msgid "_Host:"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 msgid "_Log filter actions to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 msgid "_Mark messages as Read after"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "_Name:"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 #, fuzzy
 msgid "_Organization:"
 msgstr "Organisation:"
 
-#: mail/mail-config.glade.h:108
-msgid "_PGP binary path:"
-msgstr ""
-
 #: mail/mail-config.glade.h:109
-msgid "_Path:"
+msgid "_PGP binary path:"
 msgstr ""
 
 #: mail/mail-config.glade.h:110
-msgid "_Remember PGP Passphrase until exit"
+msgid "_Path:"
 msgstr ""
 
 #: mail/mail-config.glade.h:111
@@ -8780,39 +8874,39 @@ msgstr ""
 msgid "seconds."
 msgstr ""
 
-#: mail/mail-crypto.c:60
+#: mail/mail-crypto.c:59
 msgid "Could not create a PGP signature context."
 msgstr ""
 
-#: mail/mail-crypto.c:86
+#: mail/mail-crypto.c:84
 msgid "Could not create a PGP verification context."
 msgstr ""
 
-#: mail/mail-crypto.c:116
+#: mail/mail-crypto.c:113
 msgid "Could not create a PGP encryption context."
 msgstr ""
 
-#: mail/mail-crypto.c:142
+#: mail/mail-crypto.c:138
 msgid "Could not create a PGP decryption context."
 msgstr ""
 
-#: mail/mail-crypto.c:177
+#: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
 msgstr ""
 
-#: mail/mail-crypto.c:209
+#: mail/mail-crypto.c:205
 msgid "Could not create a S/MIME certsonly context."
 msgstr ""
 
-#: mail/mail-crypto.c:240
+#: mail/mail-crypto.c:236
 msgid "Could not create a S/MIME encryption context."
 msgstr ""
 
-#: mail/mail-crypto.c:271
+#: mail/mail-crypto.c:267
 msgid "Could not create a S/MIME envelope context."
 msgstr ""
 
-#: mail/mail-crypto.c:301
+#: mail/mail-crypto.c:297
 msgid "Could not create a S/MIME decode context."
 msgstr ""
 
@@ -8858,11 +8952,11 @@ msgstr ""
 msgid "Copy Link Location"
 msgstr ""
 
-#: mail/mail-display.c:1519
+#: mail/mail-display.c:1520
 msgid "Save Link as (FIXME)"
 msgstr ""
 
-#: mail/mail-display.c:1521
+#: mail/mail-display.c:1523
 msgid "Save Image as..."
 msgstr ""
 
@@ -8879,134 +8973,134 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
-#: mail/mail-format.c:860
+#: mail/mail-format.c:862
 msgid "Bad Address"
 msgstr ""
 
-#: mail/mail-format.c:882 mail/message-list.etspec.h:3
+#: mail/mail-format.c:903 mail/message-list.etspec.h:3
 msgid "From"
 msgstr ""
 
-#: mail/mail-format.c:885
+#: mail/mail-format.c:906
 msgid "Reply-To"
 msgstr ""
 
-#: mail/mail-format.c:888 mail/message-list.etspec.h:10
+#: mail/mail-format.c:910 mail/message-list.etspec.h:10
 msgid "To"
 msgstr ""
 
-#: mail/mail-format.c:891
+#: mail/mail-format.c:914
 msgid "Cc"
 msgstr ""
 
-#: mail/mail-format.c:1311
+#: mail/mail-format.c:1357
 msgid "No GPG/PGP program configured."
 msgstr ""
 
-#: mail/mail-format.c:1327
+#: mail/mail-format.c:1373
 msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-format.c:1338
+#: mail/mail-format.c:1384
 msgid "Encrypted message"
 msgstr ""
 
-#: mail/mail-format.c:1339
+#: mail/mail-format.c:1385
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1394
+#: mail/mail-format.c:1440
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1405
+#: mail/mail-format.c:1451
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2083
+#: mail/mail-format.c:2128
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2097
+#: mail/mail-format.c:2142
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2102
+#: mail/mail-format.c:2147
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2131
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2139
+#: mail/mail-format.c:2184
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2144
+#: mail/mail-format.c:2189
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:547
+#: mail/mail-local.c:563
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-local.c:620
+#: mail/mail-local.c:636
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:676
+#: mail/mail-local.c:689
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:722
+#: mail/mail-local.c:735
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:1052
+#: mail/mail-local.c:1075
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1067
+#: mail/mail-local.c:1090
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1089
+#: mail/mail-local.c:1112
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1180
+#: mail/mail-local.c:1200
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-local.c:1190
-#, c-format
-msgid "Reconfigure %s"
-msgstr ""
+#: mail/mail-local.c:1209
+#, fuzzy, c-format
+msgid "Reconfigure /%s"
+msgstr "Synchronising \"%s\""
 
-#: mail/mail-mt.c:188
+#: mail/mail-mt.c:199
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:191
+#: mail/mail-mt.c:202
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -9014,20 +9108,24 @@ msgid ""
 msgstr ""
 
 #. Remember the password?
-#: mail/mail-mt.c:454
+#: mail/mail-mt.c:509
 msgid "Remember this password"
 msgstr ""
 
-#: mail/mail-mt.c:511
+#: mail/mail-mt.c:510
+msgid "Remember this password for the remainder of this session"
+msgstr ""
+
+#: mail/mail-mt.c:567
 #, c-format
 msgid "Enter Password for %s"
 msgstr ""
 
-#: mail/mail-mt.c:514
+#: mail/mail-mt.c:570
 msgid "Enter Password"
 msgstr ""
 
-#: mail/mail-mt.c:824
+#: mail/mail-mt.c:886
 msgid "Working"
 msgstr ""
 
@@ -9178,6 +9276,11 @@ msgstr ""
 msgid "Disconnecting from %s"
 msgstr ""
 
+#: mail/mail-ops.c:2065
+#, fuzzy, c-format
+msgid "Reconnecting to %s"
+msgstr "Synchronise \"%s\""
+
 #: mail/mail-search-dialogue.c:113
 msgid "_Search"
 msgstr ""
@@ -9233,11 +9336,11 @@ msgstr ""
 msgid "Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:282
+#: mail/mail-send-recv.c:283
 msgid "Send & Receive Mail"
 msgstr ""
 
-#: mail/mail-send-recv.c:283
+#: mail/mail-send-recv.c:284
 msgid "Cancel All"
 msgstr ""
 
@@ -9257,34 +9360,48 @@ msgstr ""
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-tools.c:173
+#: mail/mail-tools.c:133
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr ""
 
-#: mail/mail-tools.c:299
+#: mail/mail-tools.c:259
 #, c-format
 msgid "Forwarded message - %s"
 msgstr ""
 
-#: mail/mail-tools.c:303
+#: mail/mail-tools.c:263
 msgid "Forwarded message"
 msgstr ""
 
-#: mail/mail-tools.c:439
+#: mail/mail-tools.c:396
 msgid "Forwarded Message"
 msgstr ""
 
-#: mail/mail-vfolder.c:161
+#: mail/mail-vfolder.c:84
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-vfolder.c:435
+#: mail/mail-vfolder.c:201
+#, fuzzy, c-format
+msgid "Updating vfolders for uri: %s"
+msgstr "Synchronising \"%s\""
+
+#: mail/mail-vfolder.c:414
+#, c-format
+msgid ""
+"The following vFolder(s):\n"
+"%sUsed the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+
+#: mail/mail-vfolder.c:636
 msgid "VFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:541
+#: mail/mail-vfolder.c:742
 msgid "New VFolder"
 msgstr ""
 
@@ -9353,7 +9470,7 @@ msgstr ""
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:2331
+#: mail/message-list.c:2334
 msgid "Generating message list"
 msgstr ""
 
@@ -9440,32 +9557,32 @@ msgstr ""
 msgid "Evolution component for the executive summary."
 msgstr "Cannot initialise Evolution's mail summary component."
 
-#: my-evolution/component-factory.c:30
+#: my-evolution/component-factory.c:45
 msgid "Folder containing the Evolution Summary"
 msgstr ""
 
-#: my-evolution/component-factory.c:139
+#: my-evolution/component-factory.c:154
 #, fuzzy
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: my-evolution/e-summary-calendar.c:248 my-evolution/e-summary-calendar.c:266
+#: my-evolution/e-summary-calendar.c:263 my-evolution/e-summary-calendar.c:281
 msgid "Appointments"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:249
+#: my-evolution/e-summary-calendar.c:264
 msgid "No appointments"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:286
+#: my-evolution/e-summary-calendar.c:301
 msgid "%k%M %d %B"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:288
+#: my-evolution/e-summary-calendar.c:303
 msgid "%l:%M %d %B"
 msgstr ""
 
-#: my-evolution/e-summary-mail.c:115
+#: my-evolution/e-summary-mail.c:130
 msgid "Mail summary"
 msgstr ""
 
@@ -9473,81 +9590,81 @@ msgstr ""
 #. see in My Evolution by default. You can find the list of all
 #. stations and their codes in Evolution sources
 #. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-preferences.c:65
-#: my-evolution/e-summary-weather.c:615
+#: my-evolution/e-summary-preferences.c:80
+#: my-evolution/e-summary-weather.c:630
 msgid "KBOS:ZSAM:EGAA"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:427
+#: my-evolution/e-summary-preferences.c:441
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:449
+#: my-evolution/e-summary-preferences.c:463
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:890
+#: my-evolution/e-summary-preferences.c:929
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:898
+#: my-evolution/e-summary-preferences.c:937
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:902
+#: my-evolution/e-summary-preferences.c:941
 msgid "Name:"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:1438
+#: my-evolution/e-summary-preferences.c:1486
 msgid "Summary Settings"
 msgstr ""
 
-#: my-evolution/e-summary-rdf.c:277 my-evolution/e-summary-rdf.c:362
-#: my-evolution/e-summary-rdf.c:395
+#: my-evolution/e-summary-rdf.c:297 my-evolution/e-summary-rdf.c:382
+#: my-evolution/e-summary-rdf.c:415
 msgid "Error downloading RDF"
 msgstr ""
 
-#: my-evolution/e-summary-rdf.c:487
+#: my-evolution/e-summary-rdf.c:507
 msgid "News Feed"
 msgstr ""
 
-#: my-evolution/e-summary-tasks.c:216
+#: my-evolution/e-summary-tasks.c:238
 msgid "No tasks"
 msgstr ""
 
-#: my-evolution/e-summary-tasks.c:255
+#: my-evolution/e-summary-tasks.c:277
 msgid "(No Description)"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:57
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:334
+#: my-evolution/e-summary-weather.c:349
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:524
+#: my-evolution/e-summary-weather.c:539
 msgid "Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:676
+#: my-evolution/e-summary-weather.c:691
 msgid "Regions"
 msgstr ""
 
-#: my-evolution/e-summary.c:162
+#: my-evolution/e-summary.c:187
 msgid "%A, %B %e %Y"
 msgstr ""
 
-#: my-evolution/e-summary.c:512 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:568 ui/my-evolution.xml.h:3
 msgid "Print Summary"
 msgstr ""
 
-#: my-evolution/e-summary.c:558
+#: my-evolution/e-summary.c:614
 msgid "Printing of Summary failed"
 msgstr ""
 
-#: my-evolution/main.c:52
+#: my-evolution/main.c:67
 #, fuzzy
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Could not initialise Bonobo"
@@ -10935,71 +11052,71 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:174
+#: shell/e-shell-folder-commands.c:176
 msgid "Cannot move a folder over itself."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:178
 msgid "Cannot copy a folder over itself."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:190
+#: shell/e-shell-folder-commands.c:192
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:294
+#: shell/e-shell-folder-commands.c:312
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:299
+#: shell/e-shell-folder-commands.c:317
 #, fuzzy
 msgid "Copy folder"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-folder-commands.c:337
+#: shell/e-shell-folder-commands.c:359
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:342
+#: shell/e-shell-folder-commands.c:364
 msgid "Move folder"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:367
+#: shell/e-shell-folder-commands.c:390
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:383
+#: shell/e-shell-folder-commands.c:406
 #, c-format
-msgid "Delete folder '%s'"
+msgid "Delete \"%s\""
 msgstr ""
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:393
+#: shell/e-shell-folder-commands.c:416
 #, c-format
-msgid "Are you sure you want to remove the '%s' folder?"
+msgid "Are you sure you want to remove the \"%s\" folder?"
 msgstr ""
 
-#. Popup a dialog asking what the user would like to rename
-#. the folder to
-#: shell/e-shell-folder-commands.c:468
-#, c-format
-msgid "Rename folder '%s'"
-msgstr ""
+#: shell/e-shell-folder-commands.c:470
+#, fuzzy, c-format
+msgid ""
+"Cannot rename folder:\n"
+"%s"
+msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-folder-commands.c:472
-msgid "Rename"
+#: shell/e-shell-folder-commands.c:503
+#, c-format
+msgid "Rename the \"%s\" folder to:"
 msgstr ""
 
-#. Make, pack the label
-#: shell/e-shell-folder-commands.c:480
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr ""
+#: shell/e-shell-folder-commands.c:506
+#, fuzzy
+msgid "Rename folder"
+msgstr "Synchronising \"%s\""
 
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
@@ -11033,13 +11150,13 @@ msgstr ""
 msgid "Evolution - Create new folder"
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:99
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:348
+#: shell/e-shell-folder-selection-dialog.c:360
 msgid "New..."
 msgstr ""
 
@@ -11047,7 +11164,11 @@ msgstr ""
 msgid "(Untitled)"
 msgstr ""
 
-#: shell/e-shell-importer.c:102
+#: shell/e-shell-importer.c:141
+msgid "Choose the type of importer to run"
+msgstr ""
+
+#: shell/e-shell-importer.c:144
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -11056,9 +11177,13 @@ msgid ""
 "to work it out."
 msgstr ""
 
+#: shell/e-shell-importer.c:150
+msgid "Please select the information that you would like to import"
+msgstr ""
+
 #. Importer isn't ready yet.
 #. Wait 5 seconds and try again.
-#: shell/e-shell-importer.c:197
+#: shell/e-shell-importer.c:242
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11066,83 +11191,106 @@ msgid ""
 "Waiting 5 seconds to retry."
 msgstr ""
 
-#: shell/e-shell-importer.c:217 shell/e-shell-importer.c:248
+#: shell/e-shell-importer.c:262 shell/e-shell-importer.c:293
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:351
+#: shell/e-shell-importer.c:396
 #, c-format
 msgid "File %s does not exist"
 msgstr ""
 
-#: shell/e-shell-importer.c:363
+#: shell/e-shell-importer.c:408
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:378
+#: shell/e-shell-importer.c:423
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-importer.c:388
+#: shell/e-shell-importer.c:433
 msgid "Importing"
 msgstr ""
 
-#: shell/e-shell-importer.c:396
+#: shell/e-shell-importer.c:441
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:454
 #, c-format
 msgid "Error starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:428
+#: shell/e-shell-importer.c:473
 #, c-format
 msgid "Error loading %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:490
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:560
 msgid "Automatic"
 msgstr ""
 
-#: shell/e-shell-importer.c:566
+#: shell/e-shell-importer.c:611
 msgid "Filename:"
 msgstr ""
 
-#: shell/e-shell-importer.c:571
+#: shell/e-shell-importer.c:616
 msgid "Select a file"
 msgstr ""
 
-#: shell/e-shell-importer.c:581
+#: shell/e-shell-importer.c:626
 msgid "File type:"
 msgstr ""
 
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:651
+msgid "Import data and settings from older programs"
+msgstr ""
+
+#: shell/e-shell-importer.c:655
+msgid "Import a single file"
+msgstr ""
+
+#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:582
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:585
+msgid "Starting Intelligent Importers"
+msgstr ""
+
+#: shell/e-shell-importer.c:840 shell/e-shell-startup-wizard.c:703
+#, c-format
+msgid "From %s:"
+msgstr ""
+
+#: shell/e-shell-importer.c:1003
 #, fuzzy
 msgid "Select folder"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-importer.c:646
+#: shell/e-shell-importer.c:1004
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:689 shell/importer/intelligent.c:194
+#: shell/e-shell-importer.c:1116 shell/importer/intelligent.c:194
 msgid "Import"
 msgstr ""
 
@@ -11162,72 +11310,66 @@ msgstr ""
 msgid "Cannot initialize the Evolution Mailer Wizard interface"
 msgstr "Cannot initialise Evolution's mail storage hash."
 
-#: shell/e-shell-startup-wizard.c:582
-msgid ""
-"Please wait...\n"
-"Scanning for existing setups"
-msgstr ""
-
-#: shell/e-shell-startup-wizard.c:585
-msgid "Starting Intelligent Importers"
-msgstr ""
-
-#: shell/e-shell-startup-wizard.c:703
-#, c-format
-msgid "From %s:"
-msgstr ""
-
 #: shell/e-shell-startup-wizard.c:745
 msgid ""
 "Please select the information\n"
 "that you would like to import"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:183
+#: shell/e-shell-view-menu.c:201
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:191
+#: shell/e-shell-view-menu.c:209
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:217
+#: shell/e-shell-view-menu.c:235
 #, fuzzy
 msgid "Ximian Evolution"
 msgstr "Cannot initialise the Evolution shell."
 
-#: shell/e-shell-view-menu.c:219
+#: shell/e-shell-view-menu.c:237
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:221
+#: shell/e-shell-view-menu.c:239
 msgid ""
 "Ximian Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
 "within the GNOME desktop environment."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:424
+#: shell/e-shell-view-menu.c:442
 msgid "Go to folder..."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:425
+#: shell/e-shell-view-menu.c:443
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:570
+#: shell/e-shell-view-menu.c:563
 msgid "Create a new shortcut"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:571
+#: shell/e-shell-view-menu.c:564
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:685
+#: shell/e-shell-view-menu.c:595
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:603
+#, c-format
+msgid "Error executing %s."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:705
 msgid "Work Online"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:698 shell/e-shell-view-menu.c:711
+#: shell/e-shell-view-menu.c:718 shell/e-shell-view-menu.c:731
 #: ui/evolution.xml.h:30
 msgid "Work Offline"
 msgstr ""
@@ -11236,68 +11378,68 @@ msgstr ""
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:1478
+#: shell/e-shell-view.c:1512
 #, c-format
 msgid "%s (%d)"
 msgstr ""
 
-#: shell/e-shell-view.c:1480
+#: shell/e-shell-view.c:1514
 msgid "(None)"
 msgstr ""
 
-#: shell/e-shell-view.c:1485
+#: shell/e-shell-view.c:1519
 #, c-format
 msgid "%s - Ximian Evolution %s"
 msgstr ""
 
-#: shell/e-shell-view.c:1487
+#: shell/e-shell-view.c:1521
 #, c-format
 msgid "%s - Ximian Evolution %s [%s]"
 msgstr ""
 
-#: shell/e-shell-view.c:1527
+#: shell/e-shell-view.c:1561
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1534
+#: shell/e-shell-view.c:1568
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1540
+#: shell/e-shell-view.c:1574
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:560
+#: shell/e-shell.c:562
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1496
+#: shell/e-shell.c:1488
 #, c-format
 msgid ""
 "Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
 "This probably means that the %s component has crashed."
 msgstr ""
 
-#: shell/e-shell.c:1700 widgets/misc/e-cell-date-edit.c:248
+#: shell/e-shell.c:1692 widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr ""
 
-#: shell/e-shell.c:1702
+#: shell/e-shell.c:1694
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:1704
+#: shell/e-shell.c:1696
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:1706
+#: shell/e-shell.c:1698
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:1708 shell/e-storage.c:491
+#: shell/e-shell.c:1700 shell/e-storage.c:496
 msgid "Generic error"
 msgstr ""
 
@@ -11420,51 +11562,58 @@ msgstr ""
 msgid "Shortcuts"
 msgstr ""
 
+#: shell/e-storage-set-view.c:645
+#, fuzzy, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr "Synchronising \"%s\""
+
 #: shell/e-storage.c:182 shell/e-storage.c:188
 msgid "(No name)"
 msgstr ""
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:494
 msgid "No error"
 msgstr ""
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:498
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:500
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:502
 msgid "I/O error"
 msgstr ""
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:504
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:506
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:503
+#: shell/e-storage.c:508
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:512
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:514
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:516
 msgid "The specified folder cannot be modified or removed"
 msgstr ""
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:518
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
@@ -11494,6 +11643,10 @@ msgstr ""
 msgid "The following connections are currently active:"
 msgstr ""
 
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr ""
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder type:"
 msgstr ""
@@ -11542,14 +11695,22 @@ msgid "Evolution Importer Assistant"
 msgstr ""
 
 #: shell/importer/import.glade.h:4
-msgid "Import File (Step 2 of 2)"
+msgid "Import File (step 3 of 3)"
 msgstr ""
 
 #: shell/importer/import.glade.h:5
-msgid "Select a File (step 1 of 2)"
+msgid "Importer Type (step 1 of 3)"
 msgstr ""
 
 #: shell/importer/import.glade.h:6
+msgid "Select Importers (step 2 of 3)"
+msgstr ""
+
+#: shell/importer/import.glade.h:7
+msgid "Select a File (step 2 of 3)"
+msgstr ""
+
+#: shell/importer/import.glade.h:8
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of\n"
@@ -11749,13 +11910,6 @@ msgstr ""
 msgid "_Select All"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:44
-#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
-#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:19
-#: ui/my-evolution.xml.h:9
-msgid "_Tools"
-msgstr ""
-
 #: ui/evolution-calendar.xml.h:2
 msgid "Configure the calendar's settings"
 msgstr ""
@@ -11928,8 +12082,8 @@ 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:49
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:36
 msgid "_File"
 msgstr ""
@@ -11950,8 +12104,8 @@ msgstr ""
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:54
-#: ui/evolution-signature-editor.xml.h:11
+#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Save"
 msgstr ""
 
@@ -12540,6 +12694,11 @@ msgstr ""
 msgid "_Open Message"
 msgstr ""
 
+#: ui/evolution-mail-message.xml.h:98 ui/evolution.xml.h:49
+#: ui/my-evolution.xml.h:9
+msgid "_Tools"
+msgstr ""
+
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr ""
@@ -12552,8 +12711,8 @@ msgstr ""
 msgid "_Close"
 msgstr "Colours"
 
-#: ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:48
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:50
 msgid "_View"
 msgstr ""
 
@@ -12715,36 +12874,31 @@ msgid "_Cc Field"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:46
-#: ui/evolution-signature-editor.xml.h:6
-msgid "_Debug"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:47
 msgid "_Delete all"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:49
 msgid "_From Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:51
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-signature-editor.xml.h:9
 msgid "_Insert"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:51
 msgid "_Open..."
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Reply-To Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:55
+#: ui/evolution-message-composer.xml.h:54
 msgid "_Security"
 msgstr ""
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr ""
 
@@ -12878,7 +13032,7 @@ msgid "Exit the program"
 msgstr ""
 
 #: ui/evolution.xml.h:15
-msgid "Import an external file format"
+msgid "Import data from other programs"
 msgstr ""
 
 #: ui/evolution.xml.h:17
@@ -12951,7 +13105,7 @@ msgid "_Go to Folder..."
 msgstr ""
 
 #: ui/evolution.xml.h:41
-msgid "_Import File..."
+msgid "_Import..."
 msgstr ""
 
 #: ui/evolution.xml.h:42
@@ -12967,18 +13121,22 @@ msgid "_New Folder"
 msgstr ""
 
 #: ui/evolution.xml.h:45
-msgid "_Rename..."
+msgid "_Pilot Settings..."
 msgstr ""
 
 #: ui/evolution.xml.h:46
-msgid "_Shortcut"
+msgid "_Rename..."
 msgstr ""
 
 #: ui/evolution.xml.h:47
+msgid "_Shortcut"
+msgstr ""
+
+#: ui/evolution.xml.h:48
 msgid "_Shortcut Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:51
 msgid "_Work Offline"
 msgstr ""
 
@@ -13072,11 +13230,11 @@ msgstr ""
 msgid "%B %Y"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:433
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:439
 msgid "Now"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:445
 msgid "Today"
 msgstr ""
 
@@ -13221,17 +13379,17 @@ msgstr ""
 msgid "The Personal Calendar Server; calendar factory"
 msgstr ""
 
-#: wombat/wombat.c:175
+#: wombat/wombat.c:176
 #, fuzzy
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "Could not initialise Bonobo"
 
-#: wombat/wombat.c:187
+#: wombat/wombat.c:188
 #, fuzzy
 msgid "init_corba(): could not initialize GNOME"
 msgstr "Could not initialise Bonobo"
 
-#: wombat/wombat.c:200
+#: wombat/wombat.c:201
 #, fuzzy
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "Could not initialise Bonobo"
diff --git a/po/es.po b/po/es.po
index 1e95c22ac3..5f40ced17a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.13\n"
-"POT-Creation-Date: 2001-09-26 21:10+0200\n"
+"POT-Creation-Date: 2001-10-01 19:06-0400\n"
 "PO-Revision-Date: 2001-09-28 17:50+0200\n"
 "Last-Translator: H�ctor Garc�a �lvarez <hector@scouts-es.org>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -601,10 +601,10 @@ msgstr "VCard para %s"
 #: 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:1152
+#: addressbook/conduit/address-conduit.c:1167
 #: addressbook/gui/component/addressbook-factory.c:48
-#: calendar/conduits/calendar/calendar-conduit.c:1204
-#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/conduits/calendar/calendar-conduit.c:1262
+#: calendar/conduits/todo/todo-conduit.c:1034
 #: calendar/gui/alarm-notify/notify-main.c:78 calendar/gui/main.c:63
 msgid "Could not initialize Bonobo"
 msgstr "No se puede inicializar Bonobo"
@@ -663,20 +663,20 @@ msgstr "No pude cargar el cursor\n"
 msgid "EBook not loaded\n"
 msgstr "EBook no esta cargado\n"
 
-#: addressbook/conduit/address-conduit.c:714
-#: calendar/conduits/calendar/calendar-conduit.c:778
-#: calendar/conduits/todo/todo-conduit.c:592
+#: addressbook/conduit/address-conduit.c:731
+#: calendar/conduits/calendar/calendar-conduit.c:837
+#: calendar/conduits/todo/todo-conduit.c:609
 msgid "Could not start wombat server"
 msgstr "No se ha podido iniciar el servidor wombat"
 
-#: addressbook/conduit/address-conduit.c:715
-#: calendar/conduits/calendar/calendar-conduit.c:779
-#: calendar/conduits/todo/todo-conduit.c:593
+#: addressbook/conduit/address-conduit.c:732
+#: calendar/conduits/calendar/calendar-conduit.c:838
+#: calendar/conduits/todo/todo-conduit.c:610
 msgid "Could not start wombat"
 msgstr "No se puede inicializar wombat"
 
-#: addressbook/conduit/address-conduit.c:747
-#: addressbook/conduit/address-conduit.c:750
+#: addressbook/conduit/address-conduit.c:762
+#: addressbook/conduit/address-conduit.c:765
 msgid "Could not read pilot's Address application block"
 msgstr "No pude leer informaci�n de la aplicaci�n de direcciones del pilot"
 
@@ -721,8 +721,9 @@ msgid "Factory for the sample Addressbook control"
 msgstr "Factor�a para el control de ejemplo de la Agenda"
 
 #: addressbook/gui/component/addressbook-component.c:66
-#: calendar/gui/dialogs/comp-editor-util.c:281
-#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-shortcuts.c:1062
+#: calendar/gui/dialogs/comp-editor-util.c:289
+#: calendar/gui/dialogs/comp-editor-util.c:345 shell/e-local-storage.c:173
+#: shell/e-shortcuts.c:1062
 msgid "Contacts"
 msgstr "Contactos"
 
@@ -859,7 +860,7 @@ msgid "_Account name:"
 msgstr "Nombre de la cuent_a:"
 
 #: addressbook/gui/component/addressbook-config.glade.h:22
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: 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:91 my-evolution/my-evolution.glade.h:20
@@ -870,8 +871,8 @@ msgstr "_A�adir"
 #: filter/filter.glade.h:9 mail/mail-config.glade.h:96
 #: ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
 #: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
 msgstr "_Editar"
@@ -888,6 +889,10 @@ msgstr "_Puerto:"
 msgid "_Server name:"
 msgstr "Nombre del _servidor:"
 
+#: addressbook/gui/component/addressbook-storage.c:163
+msgid "Other Contacts"
+msgstr "Otros contactos"
+
 #: addressbook/gui/component/addressbook.c:407
 #, c-format
 msgid "Please enter your email address and password for access to %s"
@@ -984,7 +989,7 @@ msgid "(none)"
 msgstr "(nada)"
 
 #: addressbook/gui/component/e-address-popup.c:466
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #: addressbook/gui/contact-editor/e-contact-editor.c:1636
 msgid "Primary Email"
 msgstr "Correo electr�nico principal"
@@ -1155,60 +1160,68 @@ msgid "Details"
 msgstr "Detalles"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#, fuzzy
+msgid "F_ree/Busy URL:"
+msgstr "URL de disponibilidad"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "File A_s:"
 msgstr "Archivar c_omo:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "General"
 msgstr "General"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+msgid ""
+"If this person publishes free/busy or other calendar information on the "
+"Internet, enter the address\n"
+"of that information here."
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "New phone type"
 msgstr "Nuevo tipo de tel�fono"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "No_tes:"
 msgstr "No_tas:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Organi_zation:"
 msgstr "Organi_zaci�n:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "Phone Types"
 msgstr "Tipos de tel�fono"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "Wants to receive _HTML mail"
 msgstr "Prefiere recibir el correo como _HTML"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Address..."
 msgstr "_Direcci�n..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "_Assistant's name:"
 msgstr "Nombre del _asistente:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Birthday:"
 msgstr "Fecha de _nacimiento:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Business"
 msgstr "_Trabajo"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-msgid "_Calendar Information:"
-msgstr "informaci�n del _calendario:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 #: calendar/gui/dialogs/event-page.glade.h:12
 #: calendar/gui/dialogs/task-page.glade.h:10
 msgid "_Contacts..."
 msgstr "_Contactos..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:834 filter/filter.glade.h:8
 #: mail/folder-browser.c:1406 mail/mail-config.glade.h:95
@@ -1217,59 +1230,68 @@ msgstr "_Contactos..."
 msgid "_Delete"
 msgstr "_Borrar"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Department:"
 msgstr "_Departamento:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-msgid "_Free/Busy Information:"
-msgstr "Informaci�n de _disponibilidad:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Full Name..."
 msgstr "_Nombre completo..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Home"
 msgstr "_Casa"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Job title:"
 msgstr "_Puesto:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Manager's Name:"
 msgstr "Nombre del _manager:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Mobile"
 msgstr "_M�vil"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Nickname:"
 msgstr "Nick:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Office:"
 msgstr "_Oficina:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Profession:"
 msgstr "_Profesi�n:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#, fuzzy
+msgid "_Public Calendar URL:"
+msgstr "URI del calendario"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Spouse:"
 msgstr "_C�nyuge:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_This is the mailing address"
 msgstr "Es_t� es la direcci�n de correo"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Web page address:"
 msgstr "Direcci�n de la p�gina _web:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"�Esta seguro que quiere\n"
+"borrar este contacto?"
+
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 msgid "Delete Contact?"
 msgstr "�Borrar contacto?"
 
@@ -2497,7 +2519,7 @@ msgid "Success"
 msgstr "�xito"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1710
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1702
 #: shell/e-storage.c:520
 msgid "Unknown error"
 msgstr "Error desconocido"
@@ -2523,10 +2545,10 @@ msgid "Protocol not supported"
 msgstr "Protocolo no soportado"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:733 calendar/gui/calendar-model.c:1274
+#: calendar/gui/calendar-model.c:726 calendar/gui/calendar-model.c:1247
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:544
-#: camel/camel-service.c:580
+#: calendar/gui/e-calendar-table.c:461 camel/camel-service.c:598
+#: camel/camel-service.c:634
 msgid "Cancelled"
 msgstr "Cancelar"
 
@@ -2834,18 +2856,44 @@ msgstr "Imprimir tarjeta"
 msgid "Print envelope"
 msgstr "Imprimir sobre"
 
-#: calendar/conduits/calendar/calendar-conduit.c:735
-#: calendar/conduits/todo/todo-conduit.c:548
+#: calendar/cal-util/cal-util.c:418 calendar/cal-util/cal-util.c:440
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:385 mail/message-list.c:652
+msgid "High"
+msgstr "Alta"
+
+#: calendar/cal-util/cal-util.c:420 calendar/cal-util/cal-util.c:442
+#: calendar/gui/calendar-model.c:1673
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:386 mail/message-list.c:651
+msgid "Normal"
+msgstr "Normal"
+
+#: calendar/cal-util/cal-util.c:422 calendar/cal-util/cal-util.c:444
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:387 mail/message-list.c:650
+msgid "Low"
+msgstr "Baja"
+
+#. An empty string is the same as 'None'.
+#: calendar/cal-util/cal-util.c:438
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:388
+msgid "Undefined"
+msgstr "Sin definir"
+
+#: calendar/conduits/calendar/calendar-conduit.c:793
+#: calendar/conduits/todo/todo-conduit.c:564
 msgid "Error while communicating with calendar server"
 msgstr "Error mientras me comunicaba con el servidor de calendario"
 
-#: calendar/conduits/calendar/calendar-conduit.c:839
-#: calendar/conduits/calendar/calendar-conduit.c:842
+#: calendar/conduits/calendar/calendar-conduit.c:896
+#: calendar/conduits/calendar/calendar-conduit.c:899
 msgid "Could not read pilot's Calendar application block"
 msgstr "No pude leer informaci�n de la aplicaci�n de calendario del pilot"
 
-#: calendar/conduits/todo/todo-conduit.c:653
-#: calendar/conduits/todo/todo-conduit.c:656
+#: calendar/conduits/todo/todo-conduit.c:668
+#: calendar/conduits/todo/todo-conduit.c:671
 msgid "Could not read pilot's ToDo application block"
 msgstr "No pude leer los datos de la aplicaci�n ToDo de la pilot"
 
@@ -2894,45 +2942,45 @@ msgstr "Servicio de notificaci�n de alarmas"
 msgid "Factory for the alarm notification service"
 msgstr "Factor�a para la alarma del servicio de notificaci�n"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:152
 #, c-format
 msgid "Notification about your appointment starting on %s and ending on %s"
 msgstr "Notificaci�n sobre su cita que comienza a las %s y acaba a las %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:156
 #, c-format
 msgid "Notification about your appointment starting on %s"
 msgstr "Notificaci�n sobre su cita que comienza a las %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:161
 #, c-format
 msgid "Notification about your appointment ending on %s"
 msgstr "Notificaci�n sobre su cita que finaliza a las %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:165
 msgid "Notification about your appointment"
 msgstr "Notificaci�n sobre su cita"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:172
 #, c-format
 msgid "Notification about your task starting on %s and ending on %s"
 msgstr "Notificaci�n sobre su tarea que comienza a las %s y acaba a las %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:176
 #, c-format
 msgid "Notification about your task starting on %s"
 msgstr "Notificaci�n sobre su tarea que comienza a las %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:181
 #, c-format
 msgid "Notification about your task ending on %s"
 msgstr "Notificaci�n sobre su tarea que finaliza a las %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:185
 msgid "Notification about your task"
 msgstr "Notificaci�n sobre su tarea"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:267
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "Alarma en %A %b %d %Y %H:%M"
 
@@ -3023,7 +3071,7 @@ msgstr "%d %B %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: calendar/gui/calendar-commands.c:467
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1443
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1446
 msgid "%d %B"
 msgstr "%d de %B"
 
@@ -3032,17 +3080,17 @@ 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:399 calendar/gui/calendar-model.c:1001
-#: calendar/gui/e-calendar-table.c:307
+#: calendar/gui/calendar-model.c:399 calendar/gui/calendar-model.c:994
+#: calendar/gui/e-calendar-table.c:364
 msgid "Private"
 msgstr "Privado"
 
-#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:1003
-#: calendar/gui/e-calendar-table.c:308
+#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:996
+#: calendar/gui/e-calendar-table.c:365
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:306
+#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:363
 msgid "Public"
 msgstr "P�blico"
 
@@ -3062,67 +3110,48 @@ msgstr "E"
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:538 calendar/gui/calendar-model.c:1183
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:652
-msgid "High"
-msgstr "Alta"
-
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1185
-#: calendar/gui/calendar-model.c:1700
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:651
-msgid "Normal"
-msgstr "Normal"
-
-#: calendar/gui/calendar-model.c:542 calendar/gui/calendar-model.c:1187
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:650
-msgid "Low"
-msgstr "Baja"
-
-#: calendar/gui/calendar-model.c:573 calendar/gui/calendar-model.c:1220
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/calendar-model.c:566 calendar/gui/calendar-model.c:1193
+#: calendar/gui/e-calendar-table.c:437
 msgid "Free"
 msgstr "Libre"
 
-#: calendar/gui/calendar-model.c:575 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/calendar-model.c:568 calendar/gui/e-calendar-table.c:438
 #: calendar/gui/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr "Ocupado"
 
-#: calendar/gui/calendar-model.c:724 calendar/gui/calendar-model.c:1268
+#: calendar/gui/calendar-model.c:717 calendar/gui/calendar-model.c:1241
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:401
+#: calendar/gui/e-calendar-table.c:458
 msgid "Not Started"
 msgstr "Sin comenzando"
 
-#: calendar/gui/calendar-model.c:727 calendar/gui/calendar-model.c:1270
+#: calendar/gui/calendar-model.c:720 calendar/gui/calendar-model.c:1243
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:402
+#: calendar/gui/e-calendar-table.c:459
 msgid "In Progress"
 msgstr "En proceso"
 
-#: calendar/gui/calendar-model.c:730 calendar/gui/calendar-model.c:1272
+#: calendar/gui/calendar-model.c:723 calendar/gui/calendar-model.c:1245
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-meeting-model.c:298
+#: calendar/gui/e-calendar-table.c:460 calendar/gui/e-meeting-model.c:298
 #: calendar/gui/e-meeting-model.c:321
 msgid "Completed"
 msgstr "Completado"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:915 e-util/e-time-utils.c:163
+#: calendar/gui/calendar-model.c:908 e-util/e-time-utils.c:163
 #: e-util/e-time-utils.c:354
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:918 e-util/e-time-utils.c:158
+#: calendar/gui/calendar-model.c:911 e-util/e-time-utils.c:158
 #: e-util/e-time-utils.c:363
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:923
+#: calendar/gui/calendar-model.c:916
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -3133,7 +3162,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:1087
+#: calendar/gui/calendar-model.c:1080
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3143,47 +3172,36 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1127
+#: calendar/gui/calendar-model.c:1120
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "El valor del porcentaje debe estar entre 0 y 100"
 
-#: calendar/gui/calendar-model.c:1168
-msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
-msgstr "La prioridad debe ser 'Alta', 'Normal', 'Baja' o 'Indefinida'"
-
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1181
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:331
-msgid "Undefined"
-msgstr "Sin definir"
-
-#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1266 calendar/gui/dialogs/meeting-page.c:332
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1444
+#: calendar/gui/calendar-model.c:1239 calendar/gui/dialogs/meeting-page.c:332
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1446
 #: mail/mail-accounts.c:143 mail/mail-accounts.c:390
 #: mail/mail-config.glade.h:50
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:203
-#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
-#: widgets/misc/e-dateedit.c:1428 widgets/misc/e-dateedit.c:1543
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:453
+#: widgets/misc/e-dateedit.c:1453 widgets/misc/e-dateedit.c:1568
 msgid "None"
 msgstr "Ninguno"
 
-#: calendar/gui/calendar-model.c:1702
+#: calendar/gui/calendar-model.c:1675
 msgid "Recurring"
 msgstr "Recurriendo"
 
-#: calendar/gui/calendar-model.c:1704
+#: calendar/gui/calendar-model.c:1677
 msgid "Assigned"
 msgstr "Asignado"
 
-#: calendar/gui/calendar-model.c:1710 calendar/gui/e-meeting-model.c:270
+#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:270
 #: calendar/gui/e-meeting-model.c:280 calendar/gui/e-meeting-model.c:506
 #: calendar/gui/e-meeting-model.c:702
 msgid "Yes"
 msgstr "Si"
 
-#: calendar/gui/calendar-model.c:1710 calendar/gui/e-meeting-model.c:282
+#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:282
 #: calendar/gui/e-meeting-model.c:703
 msgid "No"
 msgstr "No"
@@ -3216,12 +3234,12 @@ msgstr "La descripci�n contiene"
 msgid "Comment contains"
 msgstr "El comentario contiene"
 
-#: calendar/gui/cal-search-bar.c:416
+#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1054
 msgid "Unmatched"
 msgstr ""
 
 #: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:6
-#: shell/e-shortcuts.c:1056
+#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1056
 msgid "Calendar"
 msgstr "Calendario"
 
@@ -3229,8 +3247,9 @@ msgstr "Calendario"
 msgid "Folder containing appointments and events"
 msgstr "Carpeta conteniendo citas y eventos"
 
-#: calendar/gui/component-factory.c:68 my-evolution/e-summary-tasks.c:216
-#: my-evolution/e-summary-tasks.c:232 shell/e-shortcuts.c:1059
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1723
+#: my-evolution/e-summary-tasks.c:237 my-evolution/e-summary-tasks.c:253
+#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1059
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Tareas"
@@ -3243,7 +3262,7 @@ msgstr "Carpeta que contiene elementos por hacer"
 msgid "Create a new appointment"
 msgstr "Crear una nueva cita"
 
-#: calendar/gui/component-factory.c:582 calendar/gui/e-day-view.c:3420
+#: calendar/gui/component-factory.c:582 calendar/gui/e-day-view.c:3422
 msgid "New _Appointment"
 msgstr "Nueva cit_a"
 
@@ -3328,95 +3347,119 @@ msgstr "horas"
 msgid "minutes"
 msgstr "minutos"
 
-#: calendar/gui/dialogs/alarm-page.c:303
+#: calendar/gui/dialogs/alarm-page.c:307
 #, c-format
 msgid "%d days"
 msgstr "%d d�as"
 
-#: calendar/gui/dialogs/alarm-page.c:305
+#: calendar/gui/dialogs/alarm-page.c:310
 msgid "1 day"
 msgstr "1 d�a"
 
-#: calendar/gui/dialogs/alarm-page.c:308
+#: calendar/gui/dialogs/alarm-page.c:315
 #, c-format
 msgid "%d weeks"
 msgstr "%d semanas"
 
-#: calendar/gui/dialogs/alarm-page.c:310
+#: calendar/gui/dialogs/alarm-page.c:318
 msgid "1 week"
 msgstr "1 semana"
 
-#: calendar/gui/dialogs/alarm-page.c:313
+#: calendar/gui/dialogs/alarm-page.c:323
 #, c-format
 msgid "%d hours"
 msgstr "%d horas"
 
-#: calendar/gui/dialogs/alarm-page.c:315
+#: calendar/gui/dialogs/alarm-page.c:326
 msgid "1 hour"
 msgstr "1 hora"
 
-#: calendar/gui/dialogs/alarm-page.c:318
+#: calendar/gui/dialogs/alarm-page.c:331
 #, c-format
 msgid "%d minutes"
 msgstr "%d minutos"
 
-#: calendar/gui/dialogs/alarm-page.c:320
+#: calendar/gui/dialogs/alarm-page.c:334
 msgid "1 minute"
 msgstr "1 minuto"
 
-#: calendar/gui/dialogs/alarm-page.c:323
+#: calendar/gui/dialogs/alarm-page.c:339
 #, c-format
 msgid "%d seconds"
 msgstr "%d segundos"
 
-#: calendar/gui/dialogs/alarm-page.c:325
+#: calendar/gui/dialogs/alarm-page.c:342
 msgid "1 second"
 msgstr "1 segundo"
 
-#: calendar/gui/dialogs/alarm-page.c:350
+#: calendar/gui/dialogs/alarm-page.c:373
 #: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "Tocar un sonido"
 
-#: calendar/gui/dialogs/alarm-page.c:354
+#: calendar/gui/dialogs/alarm-page.c:377
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 msgid "Display a message"
 msgstr "Mostrar un mensaje"
 
-#: calendar/gui/dialogs/alarm-page.c:358
+#: calendar/gui/dialogs/alarm-page.c:381
 msgid "Send an email"
 msgstr "Enviar un correo"
 
-#: calendar/gui/dialogs/alarm-page.c:362
+#: calendar/gui/dialogs/alarm-page.c:385
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "Ejecutar un programa"
 
-#: calendar/gui/dialogs/alarm-page.c:368 calendar/gui/dialogs/alarm-page.c:404
-#: calendar/gui/e-meeting-model.c:226 calendar/gui/e-meeting-model.c:261
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:674
-#: calendar/gui/e-meeting-model.c:690
-#: camel/providers/smtp/camel-smtp-transport.c:224
-#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
-msgid "Unknown"
-msgstr "Desconocido"
+#: calendar/gui/dialogs/alarm-page.c:391
+msgid "Unknown action to be performed"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:380
-msgid "before start of appointment"
-msgstr "antes comenzar la cita"
+#: calendar/gui/dialogs/alarm-page.c:403
+#, fuzzy, c-format
+msgid "%s %s before the start of the appointment"
+msgstr "antes de comenzar la cita"
 
-#: calendar/gui/dialogs/alarm-page.c:383
-msgid "after start of appointment"
-msgstr "tras iniciar la cita"
+#: calendar/gui/dialogs/alarm-page.c:406
+#, fuzzy, c-format
+msgid "%s %s after the start of the appointment"
+msgstr "antes de comenzar la cita"
+
+#: calendar/gui/dialogs/alarm-page.c:411
+#, fuzzy, c-format
+msgid "%s at the start of the appointment"
+msgstr "antes de comenzar la cita"
 
-#: calendar/gui/dialogs/alarm-page.c:393
-msgid "before end of appointment"
-msgstr "antes de finalizar la cita"
+#: calendar/gui/dialogs/alarm-page.c:420
+#, fuzzy, c-format
+msgid "%s %s before the end of the appointment"
+msgstr "antes de comenzar la cita"
 
-#: calendar/gui/dialogs/alarm-page.c:396
-msgid "after end of appointment"
+#: calendar/gui/dialogs/alarm-page.c:423
+#, fuzzy, c-format
+msgid "%s %s after the end of the appointment"
 msgstr "tras finalizar la cita"
 
+#: calendar/gui/dialogs/alarm-page.c:428
+#, fuzzy, c-format
+msgid "%s at the end of the appointment"
+msgstr "tras finalizar la cita"
+
+#: calendar/gui/dialogs/alarm-page.c:439
+#, fuzzy, c-format
+msgid "%s at an unknown time"
+msgstr "un remitente desconocido"
+
+#: calendar/gui/dialogs/alarm-page.c:445
+#, fuzzy, c-format
+msgid "%s at %s"
+msgstr "%s servidor %s"
+
+#: calendar/gui/dialogs/alarm-page.c:452
+#, c-format
+msgid "%s for an unknown trigger type"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3733,55 +3776,55 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  No ha realizado cambios, �actualizar el editor?"
 
-#: calendar/gui/dialogs/comp-editor-util.c:159 calendar/gui/print.c:2129
+#: calendar/gui/dialogs/comp-editor-util.c:167 calendar/gui/print.c:2132
 msgid " to "
 msgstr " a "
 
-#: calendar/gui/dialogs/comp-editor-util.c:163 calendar/gui/print.c:2133
+#: calendar/gui/dialogs/comp-editor-util.c:171 calendar/gui/print.c:2136
 msgid " (Completed "
 msgstr "(Completado "
 
-#: calendar/gui/dialogs/comp-editor-util.c:165 calendar/gui/print.c:2135
+#: calendar/gui/dialogs/comp-editor-util.c:173 calendar/gui/print.c:2138
 msgid "Completed "
 msgstr "Completado "
 
-#: calendar/gui/dialogs/comp-editor-util.c:170 calendar/gui/print.c:2140
+#: calendar/gui/dialogs/comp-editor-util.c:178 calendar/gui/print.c:2143
 msgid " (Due "
 msgstr " (Falta "
 
-#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2142
+#: calendar/gui/dialogs/comp-editor-util.c:180 calendar/gui/print.c:2145
 msgid "Due "
 msgstr "Falta "
 
-#: calendar/gui/dialogs/comp-editor.c:515
+#: calendar/gui/dialogs/comp-editor.c:521
 msgid "Edit Appointment"
 msgstr "Editar Cita"
 
-#: calendar/gui/dialogs/comp-editor.c:520
+#: calendar/gui/dialogs/comp-editor.c:526
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:523
+#: calendar/gui/dialogs/comp-editor.c:529
 #, c-format
 msgid "Task - %s"
 msgstr "Tarea - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:526
+#: calendar/gui/dialogs/comp-editor.c:532
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada del diario - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:540
+#: calendar/gui/dialogs/comp-editor.c:546
 msgid "No summary"
 msgstr "Sin resumen"
 
-#: calendar/gui/dialogs/comp-editor.c:950 mail/mail-callbacks.c:1670
+#: calendar/gui/dialogs/comp-editor.c:952 mail/mail-callbacks.c:1671
 #: mail/mail-display.c:100
 msgid "Overwrite file?"
 msgstr "�Sobreescribir archivo?"
 
-#: calendar/gui/dialogs/comp-editor.c:954 mail/mail-callbacks.c:1676
+#: calendar/gui/dialogs/comp-editor.c:956 mail/mail-callbacks.c:1677
 #: mail/mail-display.c:104
 msgid ""
 "A file by that name already exists.\n"
@@ -3790,12 +3833,12 @@ msgstr ""
 "Ya existe una archivo con ese nombre.\n"
 "�Sobreescribirlo?"
 
-#: calendar/gui/dialogs/comp-editor.c:1017 ui/evolution-comp-editor.xml.h:13
+#: calendar/gui/dialogs/comp-editor.c:1019 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "Guardar como..."
 
-#: calendar/gui/dialogs/comp-editor.c:1170
+#: calendar/gui/dialogs/comp-editor.c:1172
 msgid "Unable to obtain current version!"
 msgstr "�Imposible obtener versi�n actual!"
 
@@ -3913,7 +3956,7 @@ msgid "Pu_blic"
 msgstr "P�_blico"
 
 #: calendar/gui/dialogs/event-page.glade.h:10
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "Mostrar tiempo como"
 
@@ -3970,49 +4013,54 @@ msgstr "Participantes"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Common Name"
-msgstr "Nombre com�n"
+msgid "Click here to add an attendee"
+msgstr "Pulse aqu� para a�adir un participante"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
 #: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Delegated From"
-msgstr "Delegado por"
+msgid "Common Name"
+msgstr "Nombre com�n"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:4
 #: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated To"
-msgstr "Delegado a"
+msgid "Delegated From"
+msgstr "Delegado por"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:5
 #: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Language"
-msgstr "Idioma"
+msgid "Delegated To"
+msgstr "Delegado a"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:6
 #: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Member"
-msgstr "Miembro"
+msgid "Language"
+msgstr "Idioma"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
 #: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "RSVP"
-msgstr "RSVP"
+msgid "Member"
+msgstr "Miembro"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Papel"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:9 filter/libfilter-i18n.h:49
+#: 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:49
 #: mail/message-list.etspec.h:8
 msgid "Status"
 msgstr "Estado"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/mail-config.glade.h:86
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:86
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Tipo"
@@ -4034,8 +4082,8 @@ msgstr "_Invitar a otros"
 msgid "_Other Organizer"
 msgstr "_Otro organizador"
 
-#: calendar/gui/dialogs/recurrence-page.c:422 calendar/gui/print.c:1852
-#: calendar/gui/print.c:1854 calendar/gui/print.c:1855
+#: calendar/gui/dialogs/recurrence-page.c:422 calendar/gui/print.c:1855
+#: calendar/gui/print.c:1857 calendar/gui/print.c:1858
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
@@ -4154,7 +4202,7 @@ msgid "Progress"
 msgstr "Progreso"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:910
+#: my-evolution/e-summary-preferences.c:949
 msgid "URL:"
 msgstr "URL:"
 
@@ -4173,7 +4221,7 @@ msgstr "Asignaci�n"
 
 #: calendar/gui/dialogs/task-page.glade.h:4
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:28
 msgid "Description:"
 msgstr "Descripci�n:"
 
@@ -4189,105 +4237,106 @@ msgstr "_Confidencial"
 msgid "_Due Date:"
 msgstr "Fecha _de Fin:"
 
-#: calendar/gui/e-calendar-table.c:350
+#: calendar/gui/e-calendar-table.c:407
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:351
+#: calendar/gui/e-calendar-table.c:408
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:409
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:410
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:411
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:412
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:356
+#: calendar/gui/e-calendar-table.c:413
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:357
+#: calendar/gui/e-calendar-table.c:414
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:358
+#: calendar/gui/e-calendar-table.c:415
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:359
+#: calendar/gui/e-calendar-table.c:416
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:360
+#: calendar/gui/e-calendar-table.c:417
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3441
-#: calendar/gui/e-week-view.c:3288 mail/folder-browser.c:1371
+#: calendar/gui/e-calendar-table.c:914 calendar/gui/e-day-view.c:3443
+#: calendar/gui/e-week-view.c:3296 mail/folder-browser.c:1371
 #: shell/e-shortcuts-view.c:385
 msgid "_Open"
 msgstr "_Abrir"
 
-#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3450
-#: calendar/gui/e-week-view.c:3297 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:918 calendar/gui/e-day-view.c:3452
+#: calendar/gui/e-week-view.c:3305 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:856 calendar/gui/e-day-view.c:3452
-#: calendar/gui/e-week-view.c:3299 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:920 calendar/gui/e-day-view.c:3454
+#: calendar/gui/e-week-view.c:3307 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:14
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3427
-#: calendar/gui/e-day-view.c:3454 calendar/gui/e-week-view.c:3275
-#: calendar/gui/e-week-view.c:3301 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:922 calendar/gui/e-day-view.c:3429
+#: calendar/gui/e-day-view.c:3456 calendar/gui/e-week-view.c:3283
+#: calendar/gui/e-week-view.c:3309 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:40 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:17
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: calendar/gui/e-calendar-table.c:863
+#: calendar/gui/e-calendar-table.c:927
 msgid "_Mark as Complete"
 msgstr "_Marcar como completo"
 
-#: calendar/gui/e-calendar-table.c:865
+#: calendar/gui/e-calendar-table.c:929
 msgid "_Delete this Task"
 msgstr "_Borrar esta tarea"
 
-#: calendar/gui/e-calendar-table.c:868
+#: calendar/gui/e-calendar-table.c:932
 msgid "_Mark Tasks as Complete"
 msgstr "_Marcar tareas como completas"
 
-#: calendar/gui/e-calendar-table.c:870
+#: calendar/gui/e-calendar-table.c:934
 msgid "_Delete Selected Tasks"
 msgstr "_Borrar las tareas seleccionadas"
 
-#: calendar/gui/e-calendar-table.c:1130
+#: calendar/gui/e-calendar-table.c:1194
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Pulse para a�adir una tarea"
 
@@ -4295,48 +4344,48 @@ msgstr "Pulse para a�adir una tarea"
 msgid "Alarms"
 msgstr "Alarmas"
 
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:702
-#: camel/camel-filter-driver.c:819
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:718
+#: camel/camel-filter-driver.c:834
 msgid "Complete"
 msgstr "Completo"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Completion Date"
 msgstr "Fecha de vencimiento"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Due Date"
 msgstr "Fecha de plazo"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "End Date"
 msgstr "Fecha fin"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr "Posici�n geogr�fica"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Priority"
 msgstr "Prioridad"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Start Date"
 msgstr "Fecha 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:15
-#: my-evolution/component-factory.c:30 shell/e-shortcuts.c:1050
-#: shell/e-storage-set-view.c:1410
+#: calendar/gui/e-calendar-table.etspec.h:16
+#: my-evolution/component-factory.c:45 shell/e-shortcuts.c:1050
+#: shell/e-storage-set-view.c:1420 shell/e-summary-storage.c:80
 msgid "Summary"
 msgstr "Resumen"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 msgid "Task sort"
 msgstr "Ordenar tareas"
 
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:19
 msgid "URL"
 msgstr "URL"
 
@@ -4348,7 +4397,7 @@ msgstr "%02i divisiones por minuto"
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
 #: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1374
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1459
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
 msgid "%A %d %B"
 msgstr "%A %d de %B"
 
@@ -4360,44 +4409,86 @@ 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:608 calendar/gui/e-week-view.c:344
+#: calendar/gui/e-day-view.c:608 calendar/gui/e-week-view.c:345
+#: calendar/gui/print.c:769
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:347
+#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:348
+#: calendar/gui/print.c:771
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3422 calendar/gui/e-week-view.c:3270
+#: calendar/gui/e-day-view.c:3424 calendar/gui/e-week-view.c:3278
 msgid "New All Day _Event"
 msgstr "Nuevo _evento para todo el d�a"
 
-#: calendar/gui/e-day-view.c:3432 calendar/gui/e-week-view.c:3280
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3288
 #: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "Ir a _hoy"
 
-#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3282
+#: calendar/gui/e-day-view.c:3436 calendar/gui/e-week-view.c:3290
 msgid "_Go to Date..."
 msgstr "_Ir a una fecha..."
 
-#: calendar/gui/e-day-view.c:3443 calendar/gui/e-week-view.c:3290
+#: calendar/gui/e-day-view.c:3445 calendar/gui/e-week-view.c:3298
 msgid "_Delete this Appointment"
 msgstr "_Borrar esta cita"
 
-#: calendar/gui/e-day-view.c:3462 calendar/gui/e-week-view.c:3315
+#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3323
 msgid "Make this Occurrence _Movable"
 msgstr "Hacer esta ocurrencia _movible"
 
-#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3317
+#: calendar/gui/e-day-view.c:3466 calendar/gui/e-week-view.c:3325
 msgid "Delete this _Occurrence"
 msgstr "Borrar esta _Ocurrencia"
 
-#: calendar/gui/e-day-view.c:3466 calendar/gui/e-week-view.c:3319
+#: calendar/gui/e-day-view.c:3468 calendar/gui/e-week-view.c:3327
 msgid "Delete _All Occurrences"
 msgstr "Borrar tod_as las ocurrencias"
 
+#: calendar/gui/e-itip-control.c:469
+msgid "Meeting begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:474
+msgid "Task begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:479
+#, fuzzy
+msgid "Free/Busy info begins: <b>"
+msgstr "Informaci�n de _disponibilidad:"
+
+#: calendar/gui/e-itip-control.c:483
+msgid "Begins: <b>"
+msgstr ""
+
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:677
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+"<br> Por favor revise la siguiente informaci�n, y seleccion una acci�n del "
+"men� de debajo."
+
+#: calendar/gui/e-itip-control.c:692
+#, c-format
+msgid "<b>Summary:</b> %s<br><br>"
+msgstr "<b>Resumen:</b> %s<br><br>"
+
+#: calendar/gui/e-itip-control.c:692
+msgid "<i>None</i>"
+msgstr "<i>Nada</i>"
+
+#: calendar/gui/e-itip-control.c:702
+#, c-format
+msgid "<b>Description:</b> %s"
+msgstr "<b>Descripci�n:</b> %s"
+
 #: calendar/gui/e-itip-control.c:737
 #, c-format
 msgid "<b>%s</b> has published meeting information."
@@ -4668,6 +4759,14 @@ msgstr "Recurso"
 msgid "Room"
 msgstr "Habitaci�n"
 
+#: calendar/gui/e-meeting-model.c:226 calendar/gui/e-meeting-model.c:261
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:674
+#: calendar/gui/e-meeting-model.c:690
+#: camel/providers/smtp/camel-smtp-transport.c:224
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
+msgid "Unknown"
+msgstr "Desconocido"
+
 #: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
 #: calendar/gui/e-meeting-model.c:686
 msgid "Chair"
@@ -4735,7 +4834,7 @@ msgstr "%a %m %d %Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:480 e-util/e-time-utils.c:221
-#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1552
+#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1577
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
@@ -4813,16 +4912,16 @@ msgstr "No puedo cargar las tareas en `%s'"
 msgid "The method required to load `%s' is not supported"
 msgstr "El m�todo necesario para cargar `%s' no esta soportado"
 
-#: calendar/gui/e-week-view.c:3268 calendar/gui/e-week-view.c:3306
+#: calendar/gui/e-week-view.c:3276 calendar/gui/e-week-view.c:3314
 msgid "New _Appointment..."
 msgstr "Nueva cit_a..."
 
-#: calendar/gui/gnome-cal.c:1318
+#: calendar/gui/gnome-cal.c:1319
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "No puedo abrir la carpeta en `%s'"
 
-#: calendar/gui/gnome-cal.c:1329
+#: calendar/gui/gnome-cal.c:1330
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "El m�todo necesario para abrir `%s' no esta soportado"
@@ -4891,201 +4990,201 @@ msgstr "Debe especificar un organizador."
 msgid "Could not create the component editor factory"
 msgstr "No pude crear la factor�a del componente editor"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "1st"
 msgstr "1�"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "2nd"
 msgstr "2�"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "3rd"
 msgstr "3�"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "4th"
 msgstr "4�"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "5th"
 msgstr "5�"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "6th"
 msgstr "6�"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "7th"
 msgstr "7�"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "8th"
 msgstr "8�"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "9th"
 msgstr "9�"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "10th"
 msgstr "10�"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "11th"
 msgstr "11�"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "12th"
 msgstr "12�"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "13th"
 msgstr "13�"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "14th"
 msgstr "14�"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "15th"
 msgstr "15�"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "16th"
 msgstr "16�"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "17th"
 msgstr "17�"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "18th"
 msgstr "18�"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "19th"
 msgstr "19�"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "20th"
 msgstr "20�"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "21st"
 msgstr "21�"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "22nd"
 msgstr "22�"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "23rd"
 msgstr "23�"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "24th"
 msgstr "24�"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "25th"
 msgstr "25�"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "26th"
 msgstr "26�"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "27th"
 msgstr "27�"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "28th"
 msgstr "28�"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "29th"
 msgstr "29�"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "30th"
 msgstr "30�"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:432
 msgid "31st"
 msgstr "31�"
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "Su"
 msgstr "Do"
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "Mo"
 msgstr "Lun"
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "Tu"
 msgstr "Mar"
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "We"
 msgstr "Mier"
 
-#: calendar/gui/print.c:497
+#: calendar/gui/print.c:500
 msgid "Th"
 msgstr "Jue"
 
-#: calendar/gui/print.c:497
+#: calendar/gui/print.c:500
 msgid "Fr"
 msgstr "Vier"
 
-#: calendar/gui/print.c:497
+#: calendar/gui/print.c:500
 msgid "Sa"
 msgstr "Sab"
 
 #. Day
-#: calendar/gui/print.c:1828
+#: calendar/gui/print.c:1831
 msgid "Selected day (%a %b %d %Y)"
 msgstr "D�a seleccionado (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1847 calendar/gui/print.c:1851
+#: calendar/gui/print.c:1850 calendar/gui/print.c:1854
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1848
+#: calendar/gui/print.c:1851
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1859
+#: calendar/gui/print.c:1862
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Semana seleccionada (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1867
+#: calendar/gui/print.c:1870
 msgid "Selected month (%b %Y)"
 msgstr "Mes seleccionado (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1874
+#: calendar/gui/print.c:1877
 msgid "Selected year (%Y)"
 msgstr "A�o seleccionado (%Y)"
 
-#: calendar/gui/print.c:2215
+#: calendar/gui/print.c:2221
 msgid "Print Calendar"
 msgstr "Imprimir calendario"
 
-#: calendar/gui/print.c:2303 calendar/gui/print.c:2395
-#: mail/mail-callbacks.c:2079 my-evolution/e-summary.c:592
+#: calendar/gui/print.c:2312 calendar/gui/print.c:2404
+#: mail/mail-callbacks.c:2080 my-evolution/e-summary.c:607
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
 msgstr "Vista previa"
 
-#: calendar/gui/print.c:2332
+#: calendar/gui/print.c:2341
 msgid "Print Item"
 msgstr "Imprimir Elemento"
 
-#: calendar/gui/print.c:2413
+#: calendar/gui/print.c:2422
 msgid "Print Setup"
 msgstr "Configurar impresi�n"
 
@@ -5291,61 +5390,61 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr "Resincronizando con el servidor"
 
-#: camel/camel-disco-store.c:305
+#: camel/camel-disco-store.c:336
 msgid "You must be working online to complete this operation"
 msgstr "Debe estar trabajando en l�nea para completar esta operaci�n"
 
-#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
+#: camel/camel-filter-driver.c:549 camel/camel-filter-driver.c:558
 msgid "Syncing folders"
 msgstr "Sincronizando carpetas"
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:659
 msgid "Unable to open spool folder"
 msgstr "No pude abrir la carpeta temporal"
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:668
 msgid "Unable to process spool folder"
 msgstr "No pude procesar la carpeta temporal"
 
-#: camel/camel-filter-driver.c:667
+#: camel/camel-filter-driver.c:683
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Obteniendo mensaje %d (%d%%)"
 
-#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
+#: camel/camel-filter-driver.c:687 camel/camel-filter-driver.c:700
 #, c-format
 msgid "Failed on message %d"
 msgstr "Error en el mensaje %d"
 
-#: camel/camel-filter-driver.c:672
+#: camel/camel-filter-driver.c:688
 msgid "Cannot open message"
 msgstr "No puedo abrir el mensaje"
 
-#: camel/camel-filter-driver.c:698 camel/camel-filter-driver.c:814
+#: camel/camel-filter-driver.c:714 camel/camel-filter-driver.c:829
 msgid "Syncing folder"
 msgstr "Sincronizando carpeta"
 
-#: camel/camel-filter-driver.c:770
+#: camel/camel-filter-driver.c:786
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Obteniendo mensaje %d de %d"
 
-#: camel/camel-filter-driver.c:775 camel/camel-filter-driver.c:793
+#: camel/camel-filter-driver.c:791 camel/camel-filter-driver.c:809
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Error en el mensaje %d de %d"
 
-#: camel/camel-filter-driver.c:900
+#: camel/camel-filter-driver.c:918
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Error analizando filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:906
+#: camel/camel-filter-driver.c:924
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Error ejecutando filtro: %s: %s"
 
-#: camel/camel-filter-search.c:487 camel/camel-filter-search.c:494
+#: camel/camel-filter-search.c:494 camel/camel-filter-search.c:501
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Error ejecutando la b�squeda del filtro: %s: %s"
@@ -5504,60 +5603,60 @@ msgstr "Por favor introduzca su frase de paso %s"
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr "No puedo firmar este mensaje: no hay texto plano que firmar"
 
-#: camel/camel-pgp-context.c:532 camel/camel-pgp-context.c:704
+#: camel/camel-pgp-context.c:532 camel/camel-pgp-context.c:706
 msgid "Cannot sign this message: no password provided"
 msgstr "No puedo firmar este mensaje: no se facilito la contrase�a"
 
-#: camel/camel-pgp-context.c:538 camel/camel-pgp-context.c:710
+#: camel/camel-pgp-context.c:538 camel/camel-pgp-context.c:712
 #, c-format
 msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "No puedo firmar este mensaje: no pude comunicar con GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:697
+#: camel/camel-pgp-context.c:699
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr "No puedo firmar este mensaje: no hay texto plano a firmar en claro"
 
-#: camel/camel-pgp-context.c:887
+#: camel/camel-pgp-context.c:891
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr "No puedo verificar este mensaje: no texto plano a verificar"
 
-#: camel/camel-pgp-context.c:893
+#: camel/camel-pgp-context.c:897
 #, c-format
 msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "No puedo verificar este mensaje: no pude comunicar con GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:904
+#: camel/camel-pgp-context.c:908
 #, c-format
 msgid "Cannot verify this message: couldn't create temp file: %s"
 msgstr "No puedo verificar este mensaje: no pude crear archivo temporal: %s"
 
-#: camel/camel-pgp-context.c:1070
+#: camel/camel-pgp-context.c:1076
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr "No puedo encriptar este mensaje: no hay texto plano a encriptar"
 
-#: camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1086
 msgid "Cannot encrypt this message: no password provided"
 msgstr "No puedo encriptar este mensaje: no se facilit� la contrase�a"
 
-#: camel/camel-pgp-context.c:1087
+#: camel/camel-pgp-context.c:1093
 #, c-format
 msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "No puedo encriptar este mensaje: no pude comunicar con GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:1096
+#: camel/camel-pgp-context.c:1102
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr "No puedo encriptar este mensaje: no hay destinatarios."
 
-#: camel/camel-pgp-context.c:1256
+#: camel/camel-pgp-context.c:1264
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr ""
 "No puedo desencriptar este mensaje: no hay texto cifrado a desencriptar"
 
-#: camel/camel-pgp-context.c:1264
+#: camel/camel-pgp-context.c:1272
 msgid "Cannot decrypt this message: no password provided"
 msgstr "No puedo desencriptar este mensaje: no se facilito la contrase�a"
 
-#: camel/camel-pgp-context.c:1271
+#: camel/camel-pgp-context.c:1279
 #, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "No puedo desencriptar este mensaje: no pude comunicar con GPG/PGP: %s"
@@ -5602,13 +5701,13 @@ msgstr "No pude conectar con %s (puerto %d): %s"
 msgid "(unknown host)"
 msgstr "(servidor desconocido)"
 
-#: camel/camel-remote-store.c:361 camel/camel-remote-store.c:423
-#: camel/camel-remote-store.c:486
+#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
+#: camel/camel-remote-store.c:483
 #: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "Operaci�n cancelada"
 
-#: camel/camel-remote-store.c:489
+#: camel/camel-remote-store.c:486
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "El servidor se desconect� inesperadamente: %s"
@@ -5720,7 +5819,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:492
+#: camel/providers/imap/camel-imap-store.c:494
 msgid "Bad authentication response from server."
 msgstr "Respuesta de autentificaci�n err�nea desde el servidor."
 
@@ -5767,37 +5866,37 @@ msgstr "Autenticaci�n POP antes de SMTP usando una fuente no pop"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Fall� la compilaci�n de la expresi�n regular: %s: %s"
 
-#: camel/camel-service.c:154
+#: camel/camel-service.c:157
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "La URL '%s' necesita un componente de usuario"
 
-#: camel/camel-service.c:162
+#: camel/camel-service.c:165
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "La URL '%s' necesita un componente de servidor"
 
-#: camel/camel-service.c:170
+#: camel/camel-service.c:173
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "La URL '%s' necesita un componente de ruta"
 
-#: camel/camel-service.c:548
+#: camel/camel-service.c:602
 #, c-format
 msgid "Resolving: %s"
 msgstr "Resolviendo: %s"
 
-#: camel/camel-service.c:575
+#: camel/camel-service.c:629
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Error al resolver: %s"
 
-#: camel/camel-service.c:600
+#: camel/camel-service.c:654
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Error al resolver: %s: servidor no encontrado"
 
-#: camel/camel-service.c:602
+#: camel/camel-service.c:656
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Error al resolver: %s: raz�n desconocida"
@@ -5810,12 +5909,12 @@ msgstr "Proveedor de correo de la carpeta virtual"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Para leer correo como una b�squeda de otras carpetas"
 
-#: camel/camel-session.c:322 camel/camel-session.c:391
+#: camel/camel-session.c:324 camel/camel-session.c:393
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "No hay proveedor para el protocolo `%s'"
 
-#: camel/camel-session.c:508
+#: camel/camel-session.c:510
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -5914,37 +6013,37 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "No pude analizar la URL `%s'"
 
-#: camel/camel-vee-folder.c:546
+#: camel/camel-vee-folder.c:554
 #, c-format
 msgid "No such message %s in %s"
 msgstr "No existe el mensaje %s en %s"
 
-#: camel/camel-vee-folder.c:641
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message: %s"
 msgstr "No existe el mensaje: %s"
 
-#: camel/camel-vee-store.c:251
+#: camel/camel-vee-store.c:250
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "No puedo borrar la carpeta: %s: Operaci�n no v�lida"
 
-#: camel/camel-vee-store.c:287
+#: camel/camel-vee-store.c:286
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "No puedo borrar la carpeta: %s: No existe%s"
 
-#: camel/camel-vee-store.c:299
+#: camel/camel-vee-store.c:298
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "No puedo renombrar la carpeta: %s: Operaci�n no v�lida"
 
-#: camel/camel-vee-store.c:327
+#: camel/camel-vee-store.c:326
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "No pude cambiarle el nombre a la carpeta: %s: No existe"
 
-#: camel/camel-vtrash-folder.c:106
+#: camel/camel-vtrash-folder.c:109
 msgid "You cannot copy messages from this trash folder."
 msgstr "No puede copiar mensajes de esta papelera."
 
@@ -5992,7 +6091,7 @@ msgid "Scanning for changed messages"
 msgstr "Buscando mensajes modificados"
 
 #: camel/providers/imap/camel-imap-folder.c:1491
-#: camel/providers/imap/camel-imap-folder.c:1890
+#: camel/providers/imap/camel-imap-folder.c:1899
 msgid "This message is not currently available"
 msgstr "Este mensaje no est� disponible actualmente"
 
@@ -6005,7 +6104,7 @@ msgstr "Obteniendo informaci�n de los nuevos mensajes"
 msgid "Scanning for new messages"
 msgstr "Buscando mensajes nuevos"
 
-#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/imap/camel-imap-folder.c:1936
 msgid "Could not find message body in FETCH response."
 msgstr "No pude encontrar el cuerpo del mensaje en la respuesta de FETCH"
 
@@ -6022,7 +6121,7 @@ msgstr "No puedo abrir directorio de cache: %s"
 msgid "Failed to cache message %s: %s"
 msgstr "Error al cachear el mensaje %s: %s"
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:14
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:15
 msgid "Checking for new mail"
 msgstr "Comprobando si hay correo nuevo"
 
@@ -6030,7 +6129,7 @@ msgstr "Comprobando si hay correo nuevo"
 msgid "Check for new messages in all folders"
 msgstr "Comprobar si hay mensajes nuevos en todas las carpetas"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:733
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:767
 msgid "Folders"
 msgstr "Carpetas"
 
@@ -6062,28 +6161,28 @@ msgstr "Para leer y guardar correo en los servidores IMAP."
 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:515
+#: camel/providers/imap/camel-imap-store.c:517
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "El servidor IMAP %s no soporta el m�todo de autenticaci�n requerido %s"
 
-#: camel/providers/imap/camel-imap-store.c:525
+#: camel/providers/imap/camel-imap-store.c:527
 #: camel/providers/smtp/camel-smtp-transport.c:388
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "No hay soporte para el tipo de autenticaci�n %s"
 
-#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap/camel-imap-store.c:551
 #, 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:564
+#: camel/providers/imap/camel-imap-store.c:566
 #: camel/providers/smtp/camel-smtp-transport.c:432
 msgid "You didn't enter a password."
 msgstr "No escribi� una clave."
 
-#: camel/providers/imap/camel-imap-store.c:590
+#: camel/providers/imap/camel-imap-store.c:592
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6094,12 +6193,12 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:889
+#: camel/providers/imap/camel-imap-store.c:891
 #, c-format
 msgid "No such folder %s"
 msgstr "No existe la carpeta %s"
 
-#: camel/providers/imap/camel-imap-store.c:1090
+#: camel/providers/imap/camel-imap-store.c:1131
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "No est� permitido que la carpeta ra�z contenga subcarpetas"
 
@@ -6131,51 +6230,51 @@ msgstr "Archivos de correo en formato maildir de Qmail"
 msgid "For storing local mail in qmail maildir directories."
 msgstr "Para guardar el correo local en directorios del tipo maildir de qmail."
 
-#: camel/providers/local/camel-local-provider.c:77
+#: camel/providers/local/camel-local-provider.c:78
 msgid "Standard Unix mbox spools"
 msgstr "Mbox est�ndar de Unix"
 
-#: camel/providers/local/camel-local-provider.c:78
+#: camel/providers/local/camel-local-provider.c:79
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr "Para leer y guardar el correo local en directorios est�ndar mbox."
 
-#: camel/providers/local/camel-local-store.c:127
-#: camel/providers/local/camel-spool-store.c:112
+#: camel/providers/local/camel-local-store.c:132
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "La direcci�n %s no es absoluta"
 
-#: camel/providers/local/camel-local-store.c:134
+#: camel/providers/local/camel-local-store.c:139
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "%s no es un directorio normal"
 
-#: camel/providers/local/camel-local-store.c:142
-#: camel/providers/local/camel-local-store.c:158
+#: camel/providers/local/camel-local-store.c:147
+#: camel/providers/local/camel-local-store.c:163
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "No pude acceder a la carpeta: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:173
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "Los almacenadores locales no tienen una carpeta de entrada"
 
-#: camel/providers/local/camel-local-store.c:183
+#: camel/providers/local/camel-local-store.c:190
 #, c-format
 msgid "Local mail file %s"
 msgstr "Archivo de correo local %s"
 
-#: camel/providers/local/camel-local-store.c:240
+#: camel/providers/local/camel-local-store.c:247
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "No pude cambiarle el nombre de la carpeta %s a %s: %s"
 
-#: camel/providers/local/camel-local-store.c:282
+#: camel/providers/local/camel-local-store.c:289
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "No pude borrar el resumen la carpeta `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:292
+#: camel/providers/local/camel-local-store.c:299
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "No pude borrar el �ndice de la carpeta `%s': %s"
@@ -6459,26 +6558,26 @@ msgstr "No puedo abrir el directorio MH en la ruta: %s: %s"
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "No puedo a�adir el mensaje al archivo: %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:133
+#: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Spool `%s' does not exist or is not a regular file"
 msgstr "`%s' no existe o no es un archivo normal."
 
-#: camel/providers/local/camel-spool-store.c:159
+#: camel/providers/local/camel-spool-store.c:142
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "La carpeta `%s/%s' no existe."
 
-#: camel/providers/local/camel-spool-store.c:181
+#: camel/providers/local/camel-spool-store.c:164
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Archivo de cola de correo %s"
 
-#: camel/providers/local/camel-spool-store.c:227
+#: camel/providers/local/camel-spool-store.c:210
 msgid "Spool folders cannot be renamed"
 msgstr "Las carpetas de correo no pueden ser renombradas"
 
-#: camel/providers/local/camel-spool-store.c:235
+#: camel/providers/local/camel-spool-store.c:218
 msgid "Spool folders cannot be deleted"
 msgstr "Las carpetas de correo no pueden ser borradas"
 
@@ -6604,30 +6703,30 @@ msgstr "Obteniendo resumen POP"
 msgid "Could not check POP server for new messages: %s"
 msgstr "No pude comprobar si hay nuevos mensajes en el servidor POP: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:235
+#: camel/providers/pop3/camel-pop3-folder.c:242
 msgid "Could not open folder: message listing was incomplete."
 msgstr "No pude abrir la carpeta: listados de los mensajes incompletos."
 
-#: camel/providers/pop3/camel-pop3-folder.c:259
+#: camel/providers/pop3/camel-pop3-folder.c:266
 msgid "Expunging deleted messages"
 msgstr "Eliminando los mensajes borrados"
 
-#: camel/providers/pop3/camel-pop3-folder.c:335
+#: camel/providers/pop3/camel-pop3-folder.c:342
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "No pude obtener el mensaje: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:351
+#: camel/providers/pop3/camel-pop3-folder.c:358
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "No pude obtener los mensajes del servidor POP %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:374
+#: camel/providers/pop3/camel-pop3-folder.c:381
 #, c-format
 msgid "No message with uid %s"
 msgstr "No hay mensajes con uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:378
+#: camel/providers/pop3/camel-pop3-folder.c:385
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Obteniendo mensaje POP %d"
@@ -7414,13 +7513,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:309 e-util/e-time-utils.c:396
-#: widgets/misc/e-dateedit.c:1360 widgets/misc/e-dateedit.c:1587
+#: widgets/misc/e-dateedit.c:1385 widgets/misc/e-dateedit.c:1612
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:313 e-util/e-time-utils.c:388
-#: widgets/misc/e-dateedit.c:1357 widgets/misc/e-dateedit.c:1584
+#: widgets/misc/e-dateedit.c:1382 widgets/misc/e-dateedit.c:1609
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -7569,8 +7668,8 @@ msgstr ""
 "Oops, te has olvidado de elegir una carpeta.\n"
 "Por favor vuelve y especifica una carpeta v�lida donde entregar el correo."
 
-#: filter/filter-folder.c:232 filter/vfolder-rule.c:351
-#: mail/mail-account-gui.c:820
+#: filter/filter-folder.c:232 filter/vfolder-rule.c:356
+#: mail/mail-account-gui.c:822
 msgid "Select Folder"
 msgstr "Seleccionar carpeta"
 
@@ -7820,7 +7919,7 @@ msgstr "Respondido a"
 msgid "Score"
 msgstr "Puntuaci�n"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1250
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1251
 msgid "Sender"
 msgstr "Remitente"
 
@@ -7852,7 +7951,7 @@ msgstr "comienza por"
 msgid "Stop Processing"
 msgstr "Parar el proceso"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:913
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:917
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Asunto"
@@ -7881,7 +7980,7 @@ msgstr "Editar Regla"
 msgid "Score Rules"
 msgstr "Reglas de puntuaci�n"
 
-#: filter/vfolder-rule.c:203
+#: filter/vfolder-rule.c:206
 msgid "Oops.  You need to to specify at least one folder as a source."
 msgstr "Oops.  Debes especificar al menos una carpeta como fuente."
 
@@ -8044,7 +8143,7 @@ msgstr "Propiedades..."
 msgid "Change this folder's properties"
 msgstr "Cambiar las propiedades de esta carpeta"
 
-#: mail/component-factory.c:700
+#: mail/component-factory.c:698
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -8052,19 +8151,19 @@ msgstr ""
 "Algunas de tus opciones de correo parece que est�n corruptas, por favor "
 "comprueba que todo est� en orden."
 
-#: mail/component-factory.c:814
+#: mail/component-factory.c:812
 msgid "New Mail Message"
 msgstr "Nuevo mensaje de correo"
 
-#: mail/component-factory.c:814
+#: mail/component-factory.c:812
 msgid "New _Mail Message"
 msgstr "Nuevo _mensaje de correo"
 
-#: mail/component-factory.c:845
+#: mail/component-factory.c:843
 msgid "Cannot initialize Evolution's mail component."
 msgstr "No puedo inicializar el componente de correo de Evolution."
 
-#: mail/component-factory.c:1031
+#: mail/component-factory.c:1032
 msgid "Cannot register storage with shell"
 msgstr "No puedo registrar un sistema de guardado con la shell"
 
@@ -8303,15 +8402,15 @@ msgstr "Editor de Noticias de Evolution"
 msgid "Evolution Account Editor"
 msgstr "Editor de cuentas de Evolution"
 
-#: mail/mail-account-gui.c:945
+#: mail/mail-account-gui.c:947
 msgid "Could not save signature file."
 msgstr "No pude guardar el archivo de firma."
 
-#: mail/mail-account-gui.c:1022
+#: mail/mail-account-gui.c:1024
 msgid "Save signature"
 msgstr "Guardar firma"
 
-#: mail/mail-account-gui.c:1028
+#: mail/mail-account-gui.c:1030
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -8321,7 +8420,7 @@ msgstr ""
 "\n"
 "�Quiere guardar los cambios?"
 
-#: mail/mail-account-gui.c:1611
+#: mail/mail-account-gui.c:1615
 msgid "You may not create two accounts with the same name."
 msgstr "No puedes crear dos cuentas con el mismo nombre."
 
@@ -8354,7 +8453,7 @@ msgid "Are you sure you want to delete this news account?"
 msgstr "�Esta seguro que quiere borrar esta cuenta de noticias?"
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:757 mail/mail-config.glade.h:43
+#: mail/mail-accounts.c:760 mail/mail-config.glade.h:45
 msgid "Mail Settings"
 msgstr "Configuraci�n del correo"
 
@@ -8462,36 +8561,36 @@ msgstr ""
 msgid "This message contains invalid recipients:"
 msgstr "Este mensaje contiene destinatarios incorrectos:"
 
-#: mail/mail-callbacks.c:453
+#: mail/mail-callbacks.c:454
 msgid "You must specify recipients in order to send this message."
 msgstr "Debes especificar destinatarios para poder enviar el mensaje."
 
-#: mail/mail-callbacks.c:549
+#: mail/mail-callbacks.c:550
 msgid "You must configure an account before you can send this email."
 msgstr "Debe configurar una cuenta antes de poder enviar este mensaje."
 
-#: mail/mail-callbacks.c:782
+#: mail/mail-callbacks.c:783
 msgid "an unknown sender"
 msgstr "un remitente desconocido"
 
-#: mail/mail-callbacks.c:787
+#: mail/mail-callbacks.c:788
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "En %a, %Y-%m-%d a %H:%M, %%s escribio:"
 
-#: mail/mail-callbacks.c:1170
+#: mail/mail-callbacks.c:1171
 msgid "Move message(s) to"
 msgstr "Mover Mensaje(s) a"
 
-#: mail/mail-callbacks.c:1172
+#: mail/mail-callbacks.c:1173
 msgid "Copy message(s) to"
 msgstr "Copiar mensaje(s) a"
 
-#: mail/mail-callbacks.c:1546
+#: mail/mail-callbacks.c:1547
 #, 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:1568
+#: mail/mail-callbacks.c:1569
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -8499,7 +8598,7 @@ msgstr ""
 "Solo puede editar mensajes guardados\n"
 "en la carpeta Borradores."
 
-#: mail/mail-callbacks.c:1602
+#: mail/mail-callbacks.c:1603
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -8507,28 +8606,28 @@ msgstr ""
 "Solo puede reenviar mensajes\n"
 "de la carpeta Enviados."
 
-#: mail/mail-callbacks.c:1614
+#: mail/mail-callbacks.c:1615
 #, 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:1635
+#: mail/mail-callbacks.c:1636
 msgid "No Message Selected"
 msgstr "Se hay mensajes seleccionados"
 
-#: mail/mail-callbacks.c:1720
+#: mail/mail-callbacks.c:1721
 msgid "Save Message As..."
 msgstr "Guardar mensaje como..."
 
-#: mail/mail-callbacks.c:1722
+#: mail/mail-callbacks.c:1723
 msgid "Save Messages As..."
 msgstr "Guardar mensajes como..."
 
-#: mail/mail-callbacks.c:1867 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:1868 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Aviso"
 
-#: mail/mail-callbacks.c:1872
+#: mail/mail-callbacks.c:1873
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8540,11 +8639,11 @@ msgstr ""
 "\n"
 "�Borrar realmente esos mensajes?"
 
-#: mail/mail-callbacks.c:1879
+#: mail/mail-callbacks.c:1880
 msgid "Do not ask me again."
 msgstr "No me preguntes otra vez."
 
-#: mail/mail-callbacks.c:1984
+#: mail/mail-callbacks.c:1985
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -8553,19 +8652,19 @@ msgstr ""
 "Error cargando la informaci�n del filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1994
+#: mail/mail-callbacks.c:1995
 msgid "Filters"
 msgstr "Filtros"
 
-#: mail/mail-callbacks.c:2040
+#: mail/mail-callbacks.c:2041
 msgid "Print Message"
 msgstr "Imprimir mensaje"
 
-#: mail/mail-callbacks.c:2086
+#: mail/mail-callbacks.c:2087
 msgid "Printing of message failed"
 msgstr "Ha fallado la impresi�n del mensaje"
 
-#: mail/mail-callbacks.c:2170
+#: mail/mail-callbacks.c:2171
 #, 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?"
@@ -8626,75 +8725,106 @@ msgstr ""
 msgid "Evolution Account Assistant"
 msgstr "Asistente de cuentas de Evolution"
 
-#: mail/mail-config.c:1850
+#: mail/mail-config.c:315
+#, c-format
+msgid "Account %d"
+msgstr "Cuenta %d"
+
+#: mail/mail-config.c:1618
+#, c-format
+msgid ""
+"Could not get inbox for new mail store:\n"
+"%s\n"
+"No shortcut will be created."
+msgstr ""
+
+#. Create the shortcut. FIXME: This only works if the
+#. * full name matches the path.
+#.
+#: mail/mail-config.c:1629
+#, c-format
+msgid "%s: Inbox"
+msgstr "%s: Inbox"
+
+#: mail/mail-config.c:1873
 msgid "Checking Service"
 msgstr "Comprobando el servicio"
 
-#: mail/mail-config.c:1921 mail/mail-config.c:1924
+#: mail/mail-config.c:1944 mail/mail-config.c:1947
 msgid "Connecting to server..."
 msgstr "Conectando al servidor..."
 
 #: mail/mail-config.glade.h:1
+#, fuzzy
+msgid " _Check for supported types "
+msgstr "_Comprobar tipos soportados"
+
+#: mail/mail-config.glade.h:2
 msgid " color"
 msgstr "color"
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL no est� soportado en esta compilaci�n de evolution)"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr "Cuenta"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr "Informaci�n de la cuenta"
 
-#: mail/mail-config.glade.h:5 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:6 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Gesti�n de la cuenta"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "Accounts"
 msgstr "Cuentas"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr "Siempre encriptarme a mi mismo cuando env�e correo cifrado"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr "Siempre encriptarme a mi mismo cuando env�e correo cifrado"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:10
 msgid "Always sign outgoing messages when using this account"
 msgstr "Firmar siempre el correo saliente al usar esta cuenta"
 
-#: mail/mail-config.glade.h:10 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Adjunto"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:12
 msgid "Authentication"
 msgstr "Autentificaci�n"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:13
 msgid "Authentication Type: "
 msgstr "Tipo de autentificaci�n: "
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:14
 msgid "Certificate ID:"
 msgstr "ID del certificado:"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:16
 msgid "Composer"
 msgstr "Nuevo"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:17
+#, fuzzy
+msgid "Configuration"
+msgstr "Configuraci�n del correo"
+
+#: mail/mail-config.glade.h:18
 msgid "Confirm when Expunging a folder"
 msgstr "Confirmar antes de comprimiendo una carpeta"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -8710,103 +8840,91 @@ msgstr ""
 "\n"
 "Pulse �Finalizar� para guardar su configuraci�n."
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr "Va_lores predeterminados"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 msgid "Default Forward style is: "
 msgstr "El estilo predeterminado de Reenv�o es: "
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "Default character encoding: "
 msgstr "Juego de caracteres predeterminado: "
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:29
 msgid "Digital IDs..."
 msgstr "ID digitales..."
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:30
 msgid "Display"
 msgstr "Mostrar"
 
-#: mail/mail-config.glade.h:28 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:31 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Hecho"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:32 shell/e-local-storage.c:174
 msgid "Drafts"
 msgstr "Borradores"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:33
 msgid "Drafts folder:"
 msgstr "Carpeta de borradores:"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:34
 msgid "E_nable"
 msgstr "_Habilitado"
 
-#: mail/mail-config.glade.h:32
-msgid "Each account must have a different name."
-msgstr "Cada cuenta debe tener un nombre diferente."
-
-#: mail/mail-config.glade.h:33 widgets/misc/e-filter-bar.h:96
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:96
 #: widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr "Editar..."
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:36
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:37
 msgid "Get Digital ID..."
 msgstr "Obtener ID digital..."
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:38
 msgid "HTML signature file:"
 msgstr "Archivo de firma en HTML:"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:38 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:40 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Identidad"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "In HTML mail"
 msgstr "Correo en HTML"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "Inline"
 msgstr "Incluido en l�nea"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 msgid "Mail Configuration"
 msgstr "Configuraci�n del correo"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Mailbox location"
 msgstr "Localizaci�n del Mailbox"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Make this my _default account"
 msgstr "Hacer de esta mi cuenta pre_determinada"
 
-#: mail/mail-config.glade.h:46
-msgid "Message _preview should be displayed by default"
-msgstr "La _previsualizaci�n de los mensajes debe mostrarse por omisi�n"
-
-#: mail/mail-config.glade.h:47
-msgid "Message list should display in a _threaded fashion by default"
-msgstr "La lista de mensajes debe mostrarse en _hilo de forma predeterminada"
-
 #: mail/mail-config.glade.h:48
 msgid "NNTP Server:"
 msgstr "Servidor NNTP:"
@@ -8888,6 +9006,7 @@ msgid "Sending Mail"
 msgstr "Enviando Correo"
 
 #: mail/mail-config.glade.h:74 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:177
 msgid "Sent"
 msgstr "Enviado"
 
@@ -9148,86 +9267,86 @@ msgstr "No puede analizar el mensaje MIME. Mostrando la fuente."
 msgid "Date"
 msgstr "Fecha"
 
-#: mail/mail-format.c:860
+#: mail/mail-format.c:862
 msgid "Bad Address"
 msgstr "Direcci�n err�nea"
 
-#: mail/mail-format.c:899 mail/message-list.etspec.h:3
+#: mail/mail-format.c:903 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "De"
 
-#: mail/mail-format.c:902
+#: mail/mail-format.c:906
 msgid "Reply-To"
 msgstr "Responder a"
 
-#: mail/mail-format.c:906 mail/message-list.etspec.h:10
+#: mail/mail-format.c:910 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "A"
 
-#: mail/mail-format.c:910
+#: mail/mail-format.c:914
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:1351
+#: mail/mail-format.c:1357
 msgid "No GPG/PGP program configured."
 msgstr "No hay programas GPG/PGP configurados."
 
-#: mail/mail-format.c:1367
+#: mail/mail-format.c:1373
 msgid "Encrypted message not displayed"
 msgstr "Mensaje encriptado no mostrado"
 
-#: mail/mail-format.c:1378
+#: mail/mail-format.c:1384
 msgid "Encrypted message"
 msgstr "Mensaje encriptado"
 
-#: mail/mail-format.c:1379
+#: mail/mail-format.c:1385
 msgid "Click icon to decrypt."
 msgstr "Pulse el icono para desencriptar."
 
-#: mail/mail-format.c:1434
+#: mail/mail-format.c:1440
 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:1445
+#: mail/mail-format.c:1451
 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:2122
+#: mail/mail-format.c:2128
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Puntero a sitio FTP (%s)"
 
-#: mail/mail-format.c:2136
+#: mail/mail-format.c:2142
 #, 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:2141
+#: mail/mail-format.c:2147
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Puntero a archivo local (%s)"
 
-#: mail/mail-format.c:2170
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Puntero a sitio FTP (%s)"
 
-#: mail/mail-format.c:2178
+#: mail/mail-format.c:2184
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Puntero a datos externos desconocidos (tipo �%s�)"
 
-#: mail/mail-format.c:2183
+#: mail/mail-format.c:2189
 msgid "Malformed external-body part."
 msgstr "Parte externa al cuerpo del mensaje mal escrita."
 
-#: mail/mail-local.c:547
+#: mail/mail-local.c:563
 msgid "Reconfiguring folder"
 msgstr "Reconfigurando carpeta"
 
-#: mail/mail-local.c:620
+#: mail/mail-local.c:636
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -9236,27 +9355,27 @@ 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:673
+#: mail/mail-local.c:689
 #, 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:719
+#: mail/mail-local.c:735
 #, 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:1049
+#: mail/mail-local.c:1075
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Cambiando la carpeta �%s� al formato �%s�"
 
-#: mail/mail-local.c:1064
+#: mail/mail-local.c:1090
 #, 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:1086
+#: mail/mail-local.c:1112
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -9264,13 +9383,13 @@ msgstr ""
 "Si no puede volver a abrir este buz�n, entonces\n"
 "puede que tenga que arreglarlo a mano."
 
-#: mail/mail-local.c:1177
+#: mail/mail-local.c:1200
 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:1187
-#, c-format
-msgid "Reconfigure %s"
+#: mail/mail-local.c:1209
+#, fuzzy, c-format
+msgid "Reconfigure /%s"
 msgstr "Reconfigurar %s"
 
 #: mail/mail-mt.c:199
@@ -9296,16 +9415,20 @@ msgstr ""
 msgid "Remember this password"
 msgstr "Recuerda esta contrase�a"
 
-#: mail/mail-mt.c:566
+#: mail/mail-mt.c:510
+msgid "Remember this password for the remainder of this session"
+msgstr ""
+
+#: mail/mail-mt.c:567
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Introduzca su contrase�a para %s"
 
-#: mail/mail-mt.c:569
+#: mail/mail-mt.c:570
 msgid "Enter Password"
 msgstr "Introduzca contrase�a"
 
-#: mail/mail-mt.c:879
+#: mail/mail-mt.c:886
 msgid "Working"
 msgstr "Trabajando"
 
@@ -9367,6 +9490,11 @@ msgstr "Copiando"
 msgid "Scanning folders in \"%s\""
 msgstr "Escaneando carpetas en �%s�"
 
+#. Fill in the new fields
+#: mail/mail-ops.c:1040 shell/e-local-storage.c:179
+msgid "Trash"
+msgstr "Papelera"
+
 #: mail/mail-ops.c:1173
 msgid "Forwarded messages"
 msgstr "Mensaje reenviados"
@@ -9455,6 +9583,11 @@ msgstr "No pude escribir datos: %s"
 msgid "Disconnecting from %s"
 msgstr "Desconectar de %s"
 
+#: mail/mail-ops.c:2065
+#, fuzzy, c-format
+msgid "Reconnecting to %s"
+msgstr "Desconectar de %s"
+
 #: mail/mail-search-dialogue.c:113
 msgid "_Search"
 msgstr "_Buscar"
@@ -9510,11 +9643,11 @@ msgstr "Camino: %s, Tipo: %s"
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: mail/mail-send-recv.c:282
+#: mail/mail-send-recv.c:283
 msgid "Send & Receive Mail"
 msgstr "Enviar y recibir correo"
 
-#: mail/mail-send-recv.c:283
+#: mail/mail-send-recv.c:284
 msgid "Cancel All"
 msgstr "Cancelar todo"
 
@@ -9534,30 +9667,48 @@ msgstr "Cancelado"
 msgid "User canceled operation."
 msgstr "Operaci�n cancelada por el usuario."
 
-#: mail/mail-tools.c:173
+#: mail/mail-tools.c:133
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "No puedo crear el mbox temporal `%s': %s"
 
-#: mail/mail-tools.c:299
+#: mail/mail-tools.c:259
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Reenviado mensaje - %s"
 
-#: mail/mail-tools.c:303
+#: mail/mail-tools.c:263
 msgid "Forwarded message"
 msgstr "Mensaje reenviado"
 
-#: mail/mail-tools.c:439
+#: mail/mail-tools.c:396
 msgid "Forwarded Message"
 msgstr "Mensaje reenviado"
 
-#: mail/mail-vfolder.c:161
+#: mail/mail-vfolder.c:84
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Configurando vfolder: %s"
 
-#: mail/mail-vfolder.c:541
+#: mail/mail-vfolder.c:201
+#, fuzzy, c-format
+msgid "Updating vfolders for uri: %s"
+msgstr "Escaneando carpetas en �%s�"
+
+#: mail/mail-vfolder.c:414
+#, c-format
+msgid ""
+"The following vFolder(s):\n"
+"%sUsed the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+
+#: mail/mail-vfolder.c:636
+msgid "VFolders"
+msgstr "Carpetas virtuales"
+
+#: mail/mail-vfolder.c:742
 msgid "New VFolder"
 msgstr "Nueva carpeta virtual"
 
@@ -9626,7 +9777,7 @@ msgstr "%a %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2331
+#: mail/message-list.c:2334
 msgid "Generating message list"
 msgstr "Generando la lista de mensajes"
 
@@ -9711,31 +9862,31 @@ msgstr "Dess_uscribir"
 msgid "Evolution component for the executive summary."
 msgstr "Componente Evolution para el resumen de trabajo."
 
-#: my-evolution/component-factory.c:30
+#: my-evolution/component-factory.c:45
 msgid "Folder containing the Evolution Summary"
 msgstr "La carpeta contiene el Resumen de Evolution"
 
-#: my-evolution/component-factory.c:139
+#: my-evolution/component-factory.c:154
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr "No puedo inicializar el componente de resumen de trabajo de Evolution."
 
-#: my-evolution/e-summary-calendar.c:248 my-evolution/e-summary-calendar.c:266
+#: my-evolution/e-summary-calendar.c:263 my-evolution/e-summary-calendar.c:281
 msgid "Appointments"
 msgstr "Citas"
 
-#: my-evolution/e-summary-calendar.c:249
+#: my-evolution/e-summary-calendar.c:264
 msgid "No appointments"
 msgstr "Sin citas"
 
-#: my-evolution/e-summary-calendar.c:286
+#: my-evolution/e-summary-calendar.c:301
 msgid "%k%M %d %B"
 msgstr "%k%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:288
+#: my-evolution/e-summary-calendar.c:303
 msgid "%l:%M %d %B"
 msgstr "%l:%M %d %B"
 
-#: my-evolution/e-summary-mail.c:115
+#: my-evolution/e-summary-mail.c:130
 msgid "Mail summary"
 msgstr "Resumen de correo"
 
@@ -9743,81 +9894,81 @@ msgstr "Resumen de correo"
 #. see in My Evolution by default. You can find the list of all
 #. stations and their codes in Evolution sources
 #. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-preferences.c:65
-#: my-evolution/e-summary-weather.c:615
+#: my-evolution/e-summary-preferences.c:80
+#: my-evolution/e-summary-weather.c:630
 msgid "KBOS:ZSAM:EGAA"
 msgstr "LEMD:LEVS:LEVC"
 
-#: my-evolution/e-summary-preferences.c:427
+#: my-evolution/e-summary-preferences.c:441
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Palabra del D�a"
 
-#: my-evolution/e-summary-preferences.c:449
+#: my-evolution/e-summary-preferences.c:463
 msgid "Quotes of the Day"
 msgstr "Frase del D�a"
 
-#: my-evolution/e-summary-preferences.c:890
+#: my-evolution/e-summary-preferences.c:929
 msgid "Add a news feed"
 msgstr "A�adir una fuente de noticias"
 
-#: my-evolution/e-summary-preferences.c:898
+#: my-evolution/e-summary-preferences.c:937
 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"
 
-#: my-evolution/e-summary-preferences.c:902
+#: my-evolution/e-summary-preferences.c:941
 msgid "Name:"
 msgstr "Nombre:"
 
-#: my-evolution/e-summary-preferences.c:1440
+#: my-evolution/e-summary-preferences.c:1486
 msgid "Summary Settings"
 msgstr "Configuraci�n del resumen"
 
-#: my-evolution/e-summary-rdf.c:277 my-evolution/e-summary-rdf.c:362
-#: my-evolution/e-summary-rdf.c:395
+#: my-evolution/e-summary-rdf.c:297 my-evolution/e-summary-rdf.c:382
+#: my-evolution/e-summary-rdf.c:415
 msgid "Error downloading RDF"
 msgstr "Error obteniendo RDF"
 
-#: my-evolution/e-summary-rdf.c:487
+#: my-evolution/e-summary-rdf.c:507
 msgid "News Feed"
 msgstr "Fuentes de noticias"
 
-#: my-evolution/e-summary-tasks.c:217
+#: my-evolution/e-summary-tasks.c:238
 msgid "No tasks"
 msgstr "No hay tareas"
 
-#: my-evolution/e-summary-tasks.c:256
+#: my-evolution/e-summary-tasks.c:277
 msgid "(No Description)"
 msgstr "(Sin descripci�n)"
 
-#: my-evolution/e-summary-weather.c:57
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr "Mi Tiempo"
 
-#: my-evolution/e-summary-weather.c:334
+#: my-evolution/e-summary-weather.c:349
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr "<dd><b>No se ha podido conectar con el servidor de tiempo</b></dd>"
 
-#: my-evolution/e-summary-weather.c:524
+#: my-evolution/e-summary-weather.c:539
 msgid "Weather"
 msgstr "Tiempo"
 
-#: my-evolution/e-summary-weather.c:676
+#: my-evolution/e-summary-weather.c:691
 msgid "Regions"
 msgstr "Regiones"
 
-#: my-evolution/e-summary.c:172
+#: my-evolution/e-summary.c:187
 msgid "%A, %B %e %Y"
 msgstr "%A, %B %e %Y"
 
-#: my-evolution/e-summary.c:553 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:568 ui/my-evolution.xml.h:3
 msgid "Print Summary"
 msgstr "Imprimir resumen"
 
-#: my-evolution/e-summary.c:599
+#: my-evolution/e-summary.c:614
 msgid "Printing of Summary failed"
 msgstr "Ha fallado la impresi�n del resumen"
 
-#: my-evolution/main.c:52
+#: my-evolution/main.c:67
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "El componente de resumen de trabajo no pudo inicializar Bonobo.\n"
 
@@ -11131,6 +11282,18 @@ msgstr "Mostrar Detalles"
 msgid "Cancel Operation"
 msgstr "Cancelar Operaci�n"
 
+#: shell/e-local-storage.c:175 shell/e-shortcuts.c:1053
+msgid "Inbox"
+msgstr "Inbox"
+
+#: shell/e-local-storage.c:176
+msgid "Outbox"
+msgstr "Salida"
+
+#: shell/e-local-storage.c:624
+msgid "Local Folders"
+msgstr "Carpetas locales"
+
 #: shell/e-setup.c:125
 msgid "Evolution installation"
 msgstr "Instalaci�n de Evolution"
@@ -11221,25 +11384,25 @@ msgstr "No puedo copiar una carpeta sobre si misma."
 msgid "Cannot move a folder into one of its descendants."
 msgstr "No puedo mover una carpeta a uno de sus descendientes."
 
-#: shell/e-shell-folder-commands.c:311
+#: shell/e-shell-folder-commands.c:312
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "Especificar una carpeta en la que copiar la carpeta �%s�:"
 
-#: shell/e-shell-folder-commands.c:316
+#: shell/e-shell-folder-commands.c:317
 msgid "Copy folder"
 msgstr "Copiar una carpeta"
 
-#: shell/e-shell-folder-commands.c:358
+#: shell/e-shell-folder-commands.c:359
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "Especificar una carpeta a la que mover la carpeta �%s�:"
 
-#: shell/e-shell-folder-commands.c:363
+#: shell/e-shell-folder-commands.c:364
 msgid "Move folder"
 msgstr "Mover una carpeta"
 
-#: shell/e-shell-folder-commands.c:389
+#: shell/e-shell-folder-commands.c:390
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -11248,18 +11411,18 @@ msgstr ""
 "No pude borrar la carpeta:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:405
+#: shell/e-shell-folder-commands.c:406
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Borrar \"%s\""
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:415
+#: shell/e-shell-folder-commands.c:416
 #, c-format
 msgid "Are you sure you want to remove the \"%s\" folder?"
 msgstr "�Esta seguro que quiere borrar la carpeta \"%s\"?"
 
-#: shell/e-shell-folder-commands.c:469
+#: shell/e-shell-folder-commands.c:470
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -11268,12 +11431,12 @@ msgstr ""
 "No puedo renombrar la carpeta:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:502
+#: shell/e-shell-folder-commands.c:503
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renombrar carpeta \"%s\" a:"
 
-#: shell/e-shell-folder-commands.c:505
+#: shell/e-shell-folder-commands.c:506
 msgid "Rename folder"
 msgstr "Renombrar carpeta"
 
@@ -11312,7 +11475,7 @@ msgstr "El nombre de carpeta especificado no es valido: %s"
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Crear nuevas carpetas"
 
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:99
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -11320,7 +11483,7 @@ msgstr ""
 "El tipo de carpeta seleccionada no es valido para\n"
 "la operaci�n requerida."
 
-#: shell/e-shell-folder-selection-dialog.c:348
+#: shell/e-shell-folder-selection-dialog.c:360
 msgid "New..."
 msgstr "Nuevo..."
 
@@ -11328,7 +11491,11 @@ msgstr "Nuevo..."
 msgid "(Untitled)"
 msgstr "(Sin t�tulo)"
 
-#: shell/e-shell-importer.c:102
+#: shell/e-shell-importer.c:141
+msgid "Choose the type of importer to run"
+msgstr ""
+
+#: shell/e-shell-importer.c:144
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -11341,9 +11508,16 @@ msgstr ""
 "\n"
 "Si no lo sabe, puede elegir �Autom�tico� y Evolution tratar� de encargarse."
 
+#: shell/e-shell-importer.c:150
+#, fuzzy
+msgid "Please select the information that you would like to import"
+msgstr ""
+"Por favor seleccione la informaci�n\n"
+"que quiera importar"
+
 #. Importer isn't ready yet.
 #. Wait 5 seconds and try again.
-#: shell/e-shell-importer.c:197
+#: shell/e-shell-importer.c:242
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11354,7 +11528,7 @@ msgstr ""
 "El importador no esta listo.\n"
 "Esperando 5 segundos antes de reintentar."
 
-#: shell/e-shell-importer.c:217 shell/e-shell-importer.c:248
+#: shell/e-shell-importer.c:262 shell/e-shell-importer.c:293
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11363,16 +11537,16 @@ msgstr ""
 "Importando %s\n"
 "Importando elemento %d."
 
-#: shell/e-shell-importer.c:351
+#: shell/e-shell-importer.c:396
 #, c-format
 msgid "File %s does not exist"
 msgstr "El archivo %s no existe"
 
-#: shell/e-shell-importer.c:363
+#: shell/e-shell-importer.c:408
 msgid "You may only import to local folders"
 msgstr "Solo puedes importar a carpetas locales"
 
-#: shell/e-shell-importer.c:378
+#: shell/e-shell-importer.c:423
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -11381,11 +11555,11 @@ msgstr ""
 "No hay ninguna herramienta para importar datos que pueda encargarse de\n"
 "%s"
 
-#: shell/e-shell-importer.c:388
+#: shell/e-shell-importer.c:433
 msgid "Importing"
 msgstr "Importando"
 
-#: shell/e-shell-importer.c:396
+#: shell/e-shell-importer.c:441
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -11394,17 +11568,17 @@ msgstr ""
 "Importando %s.\n"
 "Comenzando %s"
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:454
 #, c-format
 msgid "Error starting %s"
 msgstr "Error cargando %s"
 
-#: shell/e-shell-importer.c:428
+#: shell/e-shell-importer.c:473
 #, c-format
 msgid "Error loading %s"
 msgstr "Error cargando %s"
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:490
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11413,31 +11587,57 @@ msgstr ""
 "Importando %s\n"
 "Importando elemento 1."
 
-#: shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:560
 msgid "Automatic"
 msgstr "Autom�tico"
 
-#: shell/e-shell-importer.c:566
+#: shell/e-shell-importer.c:611
 msgid "Filename:"
 msgstr "Nombre de fichero:"
 
-#: shell/e-shell-importer.c:571
+#: shell/e-shell-importer.c:616
 msgid "Select a file"
 msgstr "Elija un archivo"
 
-#: shell/e-shell-importer.c:581
+#: shell/e-shell-importer.c:626
 msgid "File type:"
 msgstr "Tipo de archivo:"
 
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:651
+msgid "Import data and settings from older programs"
+msgstr ""
+
+#: shell/e-shell-importer.c:655
+#, fuzzy
+msgid "Import a single file"
+msgstr "Importar un formato de archivo externo"
+
+#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:582
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+"Por favor espere...\n"
+"Buscando configuraciones existentes"
+
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:585
+msgid "Starting Intelligent Importers"
+msgstr "Comenzando importadores inteligentes"
+
+#: shell/e-shell-importer.c:840 shell/e-shell-startup-wizard.c:703
+#, c-format
+msgid "From %s:"
+msgstr "De %s:"
+
+#: shell/e-shell-importer.c:1003
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
-#: shell/e-shell-importer.c:646
+#: shell/e-shell-importer.c:1004
 msgid "Select a destination folder for importing this data"
 msgstr "Seleccionar una carpeta de destino donde importar estos datos"
 
-#: shell/e-shell-importer.c:689 shell/importer/intelligent.c:194
+#: shell/e-shell-importer.c:1116 shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "Importar"
 
@@ -11458,23 +11658,6 @@ msgstr ""
 msgid "Cannot initialize the Evolution Mailer Wizard interface"
 msgstr "No puedo inicializar la interfaz del asistente de correo de Evolution"
 
-#: shell/e-shell-startup-wizard.c:582
-msgid ""
-"Please wait...\n"
-"Scanning for existing setups"
-msgstr ""
-"Por favor espere...\n"
-"Buscando configuraciones existentes"
-
-#: shell/e-shell-startup-wizard.c:585
-msgid "Starting Intelligent Importers"
-msgstr "Comenzando importadores inteligentes"
-
-#: shell/e-shell-startup-wizard.c:703
-#, c-format
-msgid "From %s:"
-msgstr "De %s:"
-
 #: shell/e-shell-startup-wizard.c:745
 msgid ""
 "Please select the information\n"
@@ -11483,23 +11666,23 @@ msgstr ""
 "Por favor seleccione la informaci�n\n"
 "que quiera importar"
 
-#: shell/e-shell-view-menu.c:199
+#: shell/e-shell-view-menu.c:201
 msgid "Bug buddy was not found in your $PATH."
 msgstr "No se ha encontrado a bug buddy en su $PATH."
 
-#: shell/e-shell-view-menu.c:207
+#: shell/e-shell-view-menu.c:209
 msgid "Bug buddy could not be run."
 msgstr "No se ha podido ejecutar bug buddy"
 
-#: shell/e-shell-view-menu.c:233
+#: shell/e-shell-view-menu.c:235
 msgid "Ximian Evolution"
 msgstr "Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:235
+#: shell/e-shell-view-menu.c:237
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:237
+#: shell/e-shell-view-menu.c:239
 msgid ""
 "Ximian Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -11509,27 +11692,36 @@ msgstr ""
 "trabajo en grupo para manejar el correo, el calendario y\n"
 "la lista de contactos en el entorno del escritorio GNOME."
 
-#: shell/e-shell-view-menu.c:439
+#: shell/e-shell-view-menu.c:442
 msgid "Go to folder..."
 msgstr "Ir a la carpeta..."
 
-#: shell/e-shell-view-menu.c:440
+#: shell/e-shell-view-menu.c:443
 msgid "Select the folder that you want to open"
 msgstr "Seleccione la carpeta que quiere abrir"
 
-#: shell/e-shell-view-menu.c:585
+#: shell/e-shell-view-menu.c:563
 msgid "Create a new shortcut"
 msgstr "Crear un nuevo atajo"
 
-#: shell/e-shell-view-menu.c:586
+#: shell/e-shell-view-menu.c:564
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Seleccione la carpeta a la que quiere que apunte el atajo:"
 
-#: shell/e-shell-view-menu.c:700
+#: shell/e-shell-view-menu.c:595
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:603
+#, fuzzy, c-format
+msgid "Error executing %s."
+msgstr "Error ejecutando filtro: %s: %s"
+
+#: shell/e-shell-view-menu.c:705
 msgid "Work Online"
 msgstr "Trabajar conectado"
 
-#: shell/e-shell-view-menu.c:713 shell/e-shell-view-menu.c:726
+#: shell/e-shell-view-menu.c:718 shell/e-shell-view-menu.c:731
 #: ui/evolution.xml.h:30
 msgid "Work Offline"
 msgstr "Trabajar desconectado"
@@ -11538,49 +11730,49 @@ msgstr "Trabajar desconectado"
 msgid "(No folder displayed)"
 msgstr "(No hay carpetas mostr�ndose)"
 
-#: shell/e-shell-view.c:1478
+#: shell/e-shell-view.c:1512
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1480
+#: shell/e-shell-view.c:1514
 msgid "(None)"
 msgstr "(nada)"
 
-#: shell/e-shell-view.c:1485
+#: shell/e-shell-view.c:1519
 #, c-format
 msgid "%s - Ximian Evolution %s"
 msgstr "%s - Ximian Evolution %s"
 
-#: shell/e-shell-view.c:1487
+#: shell/e-shell-view.c:1521
 #, c-format
 msgid "%s - Ximian Evolution %s [%s]"
 msgstr "%s - Ximian Evolution %s [%s]"
 
-#: shell/e-shell-view.c:1527
+#: shell/e-shell-view.c:1561
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution est� conectado.  Pulse este bot�n para trabajar "
 "desconectado."
 
-#: shell/e-shell-view.c:1534
+#: shell/e-shell-view.c:1568
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution est� en proceso de desconectarse."
 
-#: shell/e-shell-view.c:1540
+#: shell/e-shell-view.c:1574
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution est� desconectado.  Pulse este bot�n para trabajar "
 "conectado."
 
-#: shell/e-shell.c:560
+#: shell/e-shell.c:562
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "No puedo configurar una carpeta local -- %s"
 
-#: shell/e-shell.c:1496
+#: shell/e-shell.c:1488
 #, c-format
 msgid ""
 "Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
@@ -11589,23 +11781,23 @@ msgstr ""
 "Ooops!  La vista `%s' ha cesado inesperadamente.  :-(\n"
 "Esto probablemente significa que el componente %s se ha roto."
 
-#: shell/e-shell.c:1700 widgets/misc/e-cell-date-edit.c:248
+#: shell/e-shell.c:1692 widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "OK"
 
-#: shell/e-shell.c:1702
+#: shell/e-shell.c:1694
 msgid "Invalid arguments"
 msgstr "Argumentos inv�lidos"
 
-#: shell/e-shell.c:1704
+#: shell/e-shell.c:1696
 msgid "Cannot register on OAF"
 msgstr "No puedo registrarme en OAF"
 
-#: shell/e-shell.c:1706
+#: shell/e-shell.c:1698
 msgid "Configuration Database not found"
 msgstr "No se encontr� la base de datos de configuraci�n"
 
-#: shell/e-shell.c:1708 shell/e-storage.c:496
+#: shell/e-shell.c:1700 shell/e-storage.c:496
 msgid "Generic error"
 msgstr "Error gen�rico"
 
@@ -11730,11 +11922,7 @@ msgstr "Error guardando atajos."
 msgid "Shortcuts"
 msgstr "Atajos"
 
-#: shell/e-shortcuts.c:1053
-msgid "Inbox"
-msgstr "Inbox"
-
-#: shell/e-storage-set-view.c:643
+#: shell/e-storage-set-view.c:645
 #, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -11872,14 +12060,26 @@ msgid "Evolution Importer Assistant"
 msgstr "Asistente de importaci�n de Evolution"
 
 #: shell/importer/import.glade.h:4
-msgid "Import File (Step 2 of 2)"
+#, fuzzy
+msgid "Import File (step 3 of 3)"
 msgstr "Importar archivo (Paso 2 de 2)"
 
 #: shell/importer/import.glade.h:5
-msgid "Select a File (step 1 of 2)"
-msgstr "Elija un archivo (paso 1 de 2)"
+#, fuzzy
+msgid "Importer Type (step 1 of 3)"
+msgstr "Importar archivo (Paso 2 de 2)"
 
 #: shell/importer/import.glade.h:6
+#, fuzzy
+msgid "Select Importers (step 2 of 3)"
+msgstr "Elija un archivo (paso 1 de 2)"
+
+#: shell/importer/import.glade.h:7
+#, fuzzy
+msgid "Select a File (step 2 of 3)"
+msgstr "Elija un archivo (paso 1 de 2)"
+
+#: shell/importer/import.glade.h:8
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of\n"
@@ -12098,13 +12298,6 @@ msgstr "Bu_scar contactos"
 msgid "_Select All"
 msgstr "_Seleccionar todo"
 
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:44
-#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
-#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:19
-#: ui/my-evolution.xml.h:9
-msgid "_Tools"
-msgstr "_Herramientas"
-
 #: ui/evolution-calendar.xml.h:2
 msgid "Configure the calendar's settings"
 msgstr "Configurar las opciones del calendario"
@@ -12275,8 +12468,8 @@ msgstr "Guardar este elemento a 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:49
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:36
 msgid "_File"
 msgstr "_Archivo"
@@ -12297,8 +12490,8 @@ msgstr "Guardar el contacto y cerrar la ventana de di�logo"
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:54
-#: ui/evolution-signature-editor.xml.h:11
+#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Save"
 msgstr "_Guardar"
 
@@ -12891,6 +13084,11 @@ msgstr "Vista _Normal"
 msgid "_Open Message"
 msgstr "_Abrir Mensaje"
 
+#: ui/evolution-mail-message.xml.h:98 ui/evolution.xml.h:49
+#: ui/my-evolution.xml.h:9
+msgid "_Tools"
+msgstr "_Herramientas"
+
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Cerrar esta ventana"
@@ -12902,8 +13100,8 @@ msgstr "Cerrar esta ventana"
 msgid "_Close"
 msgstr "_Cerrar"
 
-#: ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:48
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:50
 msgid "_View"
 msgstr "_Vista"
 
@@ -13065,36 +13263,31 @@ msgid "_Cc Field"
 msgstr "Campo _Cc"
 
 #: ui/evolution-message-composer.xml.h:46
-#: ui/evolution-signature-editor.xml.h:6
-msgid "_Debug"
-msgstr "_Depurar"
-
-#: ui/evolution-message-composer.xml.h:47
 msgid "_Delete all"
 msgstr "_Borrar todo"
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:49
 msgid "_From Field"
 msgstr "Campo _De"
 
-#: ui/evolution-message-composer.xml.h:51
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-signature-editor.xml.h:9
 msgid "_Insert"
 msgstr "_Insertar"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:51
 msgid "_Open..."
 msgstr "_Abrir..."
 
-#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Reply-To Field"
 msgstr "Campo _Responder-A"
 
-#: ui/evolution-message-composer.xml.h:55
+#: ui/evolution-message-composer.xml.h:54
 msgid "_Security"
 msgstr "_Seguridad"
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "A_yuda"
 
@@ -13227,8 +13420,8 @@ msgid "Exit the program"
 msgstr "Salir del programa"
 
 #: ui/evolution.xml.h:15
-msgid "Import an external file format"
-msgstr "Importar un formato de archivo externo"
+msgid "Import data from other programs"
+msgstr ""
 
 #: ui/evolution.xml.h:17
 msgid "Move this folder to another place"
@@ -13299,8 +13492,9 @@ msgid "_Go to Folder..."
 msgstr "_Ir a la carpeta..."
 
 #: ui/evolution.xml.h:41
-msgid "_Import File..."
-msgstr "_Importar archivo..."
+#, fuzzy
+msgid "_Import..."
+msgstr "Importando..."
 
 #: ui/evolution.xml.h:42
 msgid "_Move..."
@@ -13315,18 +13509,23 @@ msgid "_New Folder"
 msgstr "_Nueva carpeta"
 
 #: ui/evolution.xml.h:45
+#, fuzzy
+msgid "_Pilot Settings..."
+msgstr "_Configuraci�n del correo..."
+
+#: ui/evolution.xml.h:46
 msgid "_Rename..."
 msgstr "_Renombrar..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:47
 msgid "_Shortcut"
 msgstr "Barra de atajo_s"
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:48
 msgid "_Shortcut Bar"
 msgstr "Barra de atajo_s"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:51
 msgid "_Work Offline"
 msgstr "_Trabajar Desconectado"
 
@@ -13423,11 +13622,11 @@ msgstr "LMMJVSD"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:433
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:439
 msgid "Now"
 msgstr "Ahora"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:445
 msgid "Today"
 msgstr "Hoy"
 
@@ -13570,73 +13769,57 @@ 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:175
+#: wombat/wombat.c:176
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): no pude inicializar GNOME-VFS"
 
-#: wombat/wombat.c:187
+#: wombat/wombat.c:188
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): no pude inicializar GNOME"
 
-#: wombat/wombat.c:200
+#: wombat/wombat.c:201
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonob(): no pude inicializar Bonobo"
 
-#~ msgid "Account %d"
-#~ msgstr "Cuenta %d"
+#~ msgid "_Calendar Information:"
+#~ msgstr "informaci�n del _calendario:"
 
-#~ msgid "_Remember PGP Passphrase until exit"
-#~ msgstr "_Recordar la frase de paso de PGP hasta salir del programa"
+#~ msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
+#~ msgstr "La prioridad debe ser 'Alta', 'Normal', 'Baja' o 'Indefinida'"
 
-#~ msgid "Delete folder '%s'"
-#~ msgstr "Borrar carpeta '%s'"
+#~ msgid "before start of appointment"
+#~ msgstr "antes comenzar la cita"
 
-#~ msgid "Rename"
-#~ msgstr "Renombrar"
+#~ msgid "after start of appointment"
+#~ msgstr "tras iniciar la cita"
 
-#~ msgid "Other Contacts"
-#~ msgstr "Otros contactos"
+#~ msgid "before end of appointment"
+#~ msgstr "antes de finalizar la cita"
 
-#~ msgid ""
-#~ "Are you sure you want\n"
-#~ "to delete this contact?"
-#~ msgstr ""
-#~ "�Esta seguro que quiere\n"
-#~ "borrar este contacto?"
+#~ msgid "Each account must have a different name."
+#~ msgstr "Cada cuenta debe tener un nombre diferente."
 
-#~ msgid "Click here to add an attendee"
-#~ msgstr "Pulse aqu� para a�adir un participante"
+#~ msgid "Message _preview should be displayed by default"
+#~ msgstr "La _previsualizaci�n de los mensajes debe mostrarse por omisi�n"
 
-#~ msgid ""
-#~ "<br> Please review the following information, and then select an action "
-#~ "from the menu below."
+#~ msgid "Message list should display in a _threaded fashion by default"
 #~ msgstr ""
-#~ "<br> Por favor revise la siguiente informaci�n, y seleccion una acci�n "
-#~ "del men� de debajo."
-
-#~ msgid "<b>Summary:</b> %s<br><br>"
-#~ msgstr "<b>Resumen:</b> %s<br><br>"
+#~ "La lista de mensajes debe mostrarse en _hilo de forma predeterminada"
 
-#~ msgid "<i>None</i>"
-#~ msgstr "<i>Nada</i>"
+#~ msgid "_Debug"
+#~ msgstr "_Depurar"
 
-#~ msgid "<b>Description:</b> %s"
-#~ msgstr "<b>Descripci�n:</b> %s"
+#~ msgid "_Import File..."
+#~ msgstr "_Importar archivo..."
 
-#~ msgid "Evolution Shortcuts"
-#~ msgstr "Atajos de Evolution"
-
-#~ msgid "%s: Inbox"
-#~ msgstr "%s: Inbox"
-
-#~ msgid "Trash"
-#~ msgstr "Papelera"
+#~ msgid "_Remember PGP Passphrase until exit"
+#~ msgstr "_Recordar la frase de paso de PGP hasta salir del programa"
 
-#~ msgid "VFolders"
-#~ msgstr "Carpetas virtuales"
+#~ msgid "Delete folder '%s'"
+#~ msgstr "Borrar carpeta '%s'"
 
-#~ msgid "Outbox"
-#~ msgstr "Salida"
+#~ msgid "Rename"
+#~ msgstr "Renombrar"
 
-#~ msgid "Local Folders"
-#~ msgstr "Carpetas locales"
+#~ msgid "Evolution Shortcuts"
+#~ msgstr "Atajos de Evolution"
diff --git a/po/fi.po b/po/fi.po
index 57f064f0e5..0bb21c872c 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2001-09-21 18:31-0400\n"
+"POT-Creation-Date: 2001-10-01 19:06-0400\n"
 "PO-Revision-Date: 2001-05-08 15:00+0300\n"
 "Last-Translator: Jarkko Ranta <jjranta@cc.joensuu.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -32,289 +32,289 @@ msgid "Name"
 msgstr "Nimi:"
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#, fuzzy
-msgid "Family Name"
-msgstr "Koko nimi"
-
-#: addressbook/backend/ebook/e-card-simple.c:61
 #: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Email"
 msgstr "S�hk�posti"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:61
 #: addressbook/gui/contact-editor/e-contact-editor.c:1609
 msgid "Primary"
 msgstr "Ensisijainen"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:61
 #, fuzzy
 msgid "Prim"
 msgstr "Ensisijainen"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:92
 #: addressbook/gui/contact-editor/e-contact-editor.c:1594
 #: addressbook/gui/widgets/e-addressbook-view.c:902
 msgid "Assistant"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/gui/contact-editor/e-contact-editor.c:1595
 #: addressbook/gui/contact-editor/e-contact-editor.c:1662
 msgid "Business"
 msgstr "Ty�"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/backend/ebook/e-card-simple.c:68
 #, fuzzy
 msgid "Bus"
 msgstr "vuotta"
 
-#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/gui/contact-editor/e-contact-editor.c:1598
 msgid "Callback"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/gui/contact-editor/e-contact-editor.c:1600
 msgid "Company"
 msgstr "Yritys"
 
-#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:65
 #, fuzzy
 msgid "Comp"
 msgstr "Kopioi"
 
-#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:69
 #: addressbook/gui/contact-editor/e-contact-editor.c:1601
 #: addressbook/gui/contact-editor/e-contact-editor.c:1663
 msgid "Home"
 msgstr "Koti"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:67
 #: addressbook/gui/widgets/e-addressbook-view.c:877
 msgid "Organization"
 msgstr "Organisaatio"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:67
 msgid "Org"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/e-contact-editor.c:1605
 msgid "Mobile"
 msgstr "Matkapuhelin"
 
-#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/e-contact-editor.c:1599
 msgid "Car"
 msgstr "Auto"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/e-contact-editor.c:1597
 #: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "Business Fax"
 msgstr "Ty�/faksi"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/backend/ebook/e-card-simple.c:72
 #, fuzzy
 msgid "Bus Fax"
 msgstr "Ty�/faksi"
 
-#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/backend/ebook/e-card-simple.c:73
 #: addressbook/gui/contact-editor/e-contact-editor.c:1603
 #: addressbook/gui/widgets/e-addressbook-view.c:883
 msgid "Home Fax"
 msgstr "Koti/faksi"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/e-contact-editor.c:1596
 msgid "Business 2"
 msgstr "Ty� 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/backend/ebook/e-card-simple.c:74
 #, fuzzy
 msgid "Bus 2"
 msgstr "Ty� 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/backend/ebook/e-card-simple.c:75
 #: addressbook/gui/contact-editor/e-contact-editor.c:1602
 msgid "Home 2"
 msgstr "Koti 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/backend/ebook/e-card-simple.c:76
 #: addressbook/gui/contact-editor/e-contact-editor.c:1604
 #: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/backend/ebook/e-card-simple.c:83
 #: addressbook/gui/contact-editor/e-contact-editor.c:1606
 #: addressbook/gui/contact-editor/e-contact-editor.c:1664
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:52
 msgid "Other"
 msgstr "Muut"
 
-#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/backend/ebook/e-card-simple.c:78
 #: addressbook/gui/contact-editor/e-contact-editor.c:1607
 #: addressbook/gui/widgets/e-addressbook-view.c:888
 msgid "Other Fax"
 msgstr "Muu faksi"
 
-#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/gui/contact-editor/e-contact-editor.c:1608
 #: addressbook/gui/widgets/e-addressbook-view.c:889
 msgid "Pager"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/backend/ebook/e-card-simple.c:80
 #: addressbook/gui/contact-editor/e-contact-editor.c:1610
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 msgid "Radio"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/backend/ebook/e-card-simple.c:81
 #: addressbook/gui/contact-editor/e-contact-editor.c:1611
 #: addressbook/gui/widgets/e-addressbook-view.c:891
 msgid "Telex"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/backend/ebook/e-card-simple.c:82
 #: addressbook/gui/widgets/e-addressbook-view.c:892
 msgid "TTY"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/backend/ebook/e-card-simple.c:84
 #: addressbook/gui/component/e-address-popup.c:476
 #: addressbook/gui/contact-editor/e-contact-editor.c:1637
 #: addressbook/gui/widgets/e-addressbook-view.c:894
 msgid "Email 2"
 msgstr "S�hk�posti 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/backend/ebook/e-card-simple.c:85
 #: addressbook/gui/component/e-address-popup.c:486
 #: addressbook/gui/contact-editor/e-contact-editor.c:1638
 #: addressbook/gui/widgets/e-addressbook-view.c:895
 msgid "Email 3"
 msgstr "S�hk�posti 3"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/widgets/e-addressbook-view.c:896
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:86
 msgid "Url"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/widgets/e-addressbook-view.c:897
 msgid "Department"
 msgstr "Osasto"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:87
 msgid "Dep"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/backend/ebook/e-card-simple.c:88
 #: addressbook/gui/widgets/e-addressbook-view.c:898
 msgid "Office"
 msgstr "Asema"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/backend/ebook/e-card-simple.c:88
 #, fuzzy
 msgid "Off"
 msgstr "Asema"
 
-#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card-simple.c:89
 #: addressbook/gui/widgets/e-addressbook-view.c:899
 msgid "Title"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:90
 #: addressbook/gui/widgets/e-addressbook-view.c:900
 msgid "Profession"
 msgstr "Ammatti"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Prof"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:91
 #: addressbook/gui/widgets/e-addressbook-view.c:901
 msgid "Manager"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:91
 #, fuzzy
 msgid "Man"
 msgstr "Toukokuu"
 
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:92
 msgid "Ass"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card-simple.c:93
 #: addressbook/gui/widgets/e-addressbook-view.c:903
 msgid "Nickname"
 msgstr "Kutsumanimi"
 
-#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card-simple.c:93
 #, fuzzy
 msgid "Nick"
 msgstr "Kutsumanimi"
 
-#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/backend/ebook/e-card-simple.c:94
 #: addressbook/gui/widgets/e-addressbook-view.c:904
 msgid "Spouse"
 msgstr "Puoliso"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card-simple.c:95
 #: addressbook/gui/widgets/e-addressbook-view.c:905
 msgid "Note"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:96
 #, fuzzy
 msgid "Calendar URI"
 msgstr "Kalenteri"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:96
 msgid "CALUri"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:97
 #: addressbook/gui/widgets/e-addressbook-view.c:906
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:97
 msgid "FBUrl"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "Anniversary"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "Anniv"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card-simple.c:99
 #, fuzzy
 msgid "Birth Date"
 msgstr ""
 "\n"
 "Syntym�p�iv�: "
 
-#: addressbook/backend/ebook/e-card-simple.c:103
+#: addressbook/backend/ebook/e-card-simple.c:102
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "Ryhm�t"
 
+#: addressbook/backend/ebook/e-card-simple.c:103
+#, fuzzy
+msgid "Family Name"
+msgstr "Koko nimi"
+
 #: addressbook/backend/ebook/e-card.c:3564
 msgid "Card: "
 msgstr "Kortti: "
@@ -596,10 +596,10 @@ msgstr ""
 #: 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:1119
+#: addressbook/conduit/address-conduit.c:1167
 #: addressbook/gui/component/addressbook-factory.c:48
-#: calendar/conduits/calendar/calendar-conduit.c:1204
-#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/conduits/calendar/calendar-conduit.c:1262
+#: calendar/conduits/todo/todo-conduit.c:1034
 #: calendar/gui/alarm-notify/notify-main.c:78 calendar/gui/main.c:63
 msgid "Could not initialize Bonobo"
 msgstr "Bonobon alustus ei onnistunut"
@@ -662,20 +662,20 @@ msgstr "Kohdistimen lataaminen ep�onnistui\n"
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:681
-#: calendar/conduits/calendar/calendar-conduit.c:778
-#: calendar/conduits/todo/todo-conduit.c:592
+#: addressbook/conduit/address-conduit.c:731
+#: calendar/conduits/calendar/calendar-conduit.c:837
+#: calendar/conduits/todo/todo-conduit.c:609
 msgid "Could not start wombat server"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:682
-#: calendar/conduits/calendar/calendar-conduit.c:779
-#: calendar/conduits/todo/todo-conduit.c:593
+#: addressbook/conduit/address-conduit.c:732
+#: calendar/conduits/calendar/calendar-conduit.c:838
+#: calendar/conduits/todo/todo-conduit.c:610
 msgid "Could not start wombat"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:714
-#: addressbook/conduit/address-conduit.c:717
+#: addressbook/conduit/address-conduit.c:762
+#: addressbook/conduit/address-conduit.c:765
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -720,8 +720,8 @@ msgid "Factory for the sample Addressbook control"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:66
-#: calendar/gui/dialogs/comp-editor-util.c:281
-#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:173
+#: calendar/gui/dialogs/comp-editor-util.c:289
+#: calendar/gui/dialogs/comp-editor-util.c:345 shell/e-local-storage.c:173
 #: shell/e-shortcuts.c:1062
 msgid "Contacts"
 msgstr "Kontaktit"
@@ -739,23 +739,23 @@ msgstr "NNTP-palvelin"
 msgid "LDAP server containing contact information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:386
+#: addressbook/gui/component/addressbook-component.c:411
 #: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "New Contact"
 msgstr "Uusi kontakti"
 
-#: addressbook/gui/component/addressbook-component.c:386
+#: addressbook/gui/component/addressbook-component.c:411
 #, fuzzy
 msgid "New _Contact"
 msgstr "Uusi kontakti"
 
-#: addressbook/gui/component/addressbook-component.c:387
+#: addressbook/gui/component/addressbook-component.c:412
 #, fuzzy
 msgid "New Contact List"
 msgstr "_Kontaktiluettelo"
 
-#: addressbook/gui/component/addressbook-component.c:387
+#: addressbook/gui/component/addressbook-component.c:412
 #, fuzzy
 msgid "New Contact _List"
 msgstr "_Kontaktiluettelo"
@@ -858,19 +858,19 @@ msgid "_Account name:"
 msgstr "_Tilin nimi:"
 
 #: addressbook/gui/component/addressbook-config.glade.h:22
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: 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:90 my-evolution/my-evolution.glade.h:20
+#: mail/mail-config.glade.h:91 my-evolution/my-evolution.glade.h:20
 msgid "_Add"
 msgstr "_Lis��"
 
 #: addressbook/gui/component/addressbook-config.glade.h:23
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:95
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:96
 #: ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
 #: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
 msgstr "_Muokkaa"
@@ -891,35 +891,35 @@ msgstr "Palvelimen _nimi: "
 msgid "Other Contacts"
 msgstr "Muut kontaktit"
 
-#: addressbook/gui/component/addressbook.c:393
+#: addressbook/gui/component/addressbook.c:407
 #, c-format
 msgid "Please enter your email address and password for access to %s"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:401
+#: addressbook/gui/component/addressbook.c:415
 msgid "LDAP Authentication"
 msgstr "LDAP-Todennus"
 
-#: addressbook/gui/component/addressbook.c:412
+#: addressbook/gui/component/addressbook.c:426
 msgid "Email Address:"
 msgstr "S�hk�postiosoite:"
 
-#: addressbook/gui/component/addressbook.c:425
+#: addressbook/gui/component/addressbook.c:439
 msgid "Password:"
 msgstr "Salasana:"
 
-#: addressbook/gui/component/addressbook.c:488
+#: addressbook/gui/component/addressbook.c:502
 msgid "Unable to open addressbook"
 msgstr "Osoitekirjaa ei voitu avata"
 
-#: addressbook/gui/component/addressbook.c:495
+#: addressbook/gui/component/addressbook.c:509
 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:500
+#: addressbook/gui/component/addressbook.c:514
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -927,45 +927,45 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:508
+#: addressbook/gui/component/addressbook.c:522
 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:649
+#: addressbook/gui/component/addressbook.c:663
 #: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "Mik� tahansa kentt� sis�lt��"
 
-#: addressbook/gui/component/addressbook.c:650
+#: addressbook/gui/component/addressbook.c:664
 msgid "Name contains"
 msgstr "Nimi sis�lt��"
 
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:665
 msgid "Email contains"
 msgstr "S�hk�posti sis�lt��"
 
-#: addressbook/gui/component/addressbook.c:652
+#: addressbook/gui/component/addressbook.c:666
 #: calendar/gui/cal-search-bar.c:59
 #, fuzzy
 msgid "Category is"
 msgstr "Ryhm�t"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:653 widgets/misc/e-filter-bar.h:97
+#: addressbook/gui/component/addressbook.c:667 widgets/misc/e-filter-bar.h:97
 #: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "Edistyneet..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:883
+#: addressbook/gui/component/addressbook.c:897
 #: calendar/gui/cal-search-bar.c:412
 #, fuzzy
 msgid "Any Category"
 msgstr "Ryhm�t:"
 
-#: addressbook/gui/component/addressbook.c:925
+#: addressbook/gui/component/addressbook.c:939
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
@@ -980,7 +980,7 @@ msgid "(none)"
 msgstr "(Ei nime�)"
 
 #: addressbook/gui/component/e-address-popup.c:466
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #: addressbook/gui/contact-editor/e-contact-editor.c:1636
 msgid "Primary Email"
 msgstr "Ensisijainen s�hk�posti"
@@ -1150,120 +1150,126 @@ msgid "Details"
 msgstr "Yksityiskohtaiset"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
+msgid "F_ree/Busy URL:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 #, fuzzy
 msgid "File A_s:"
 msgstr "Tiedoston tyyppi:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "General"
 msgstr "Yleiset"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+msgid ""
+"If this person publishes free/busy or other calendar information on the "
+"Internet, enter the address\n"
+"of that information here."
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "New phone type"
 msgstr "Uusi puhelintyyppi"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "No_tes:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Organi_zation:"
 msgstr "Organi_saatio:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "Phone Types"
 msgstr "Puhelintyypit"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "Wants to receive _HTML mail"
 msgstr "Haluaa s�hk�postit HTML-muodossa"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Address..."
 msgstr "_Osoite..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "_Assistant's name:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Birthday:"
 msgstr "_Syntym�p�iv�:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Business"
 msgstr "_Ty�"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#, fuzzy
-msgid "_Calendar Information:"
-msgstr "Tiedoksi"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 #: calendar/gui/dialogs/event-page.glade.h:12
 #: calendar/gui/dialogs/task-page.glade.h:10
 msgid "_Contacts..."
 msgstr "_Kontaktit..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:834 filter/filter.glade.h:8
-#: mail/folder-browser.c:1371 mail/mail-config.glade.h:94
+#: mail/folder-browser.c:1406 mail/mail-config.glade.h:95
 #: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "_Poista"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Department:"
 msgstr "_Osasto:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#, fuzzy
-msgid "_Free/Busy Information:"
-msgstr "L�hteen tiedot"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Full Name..."
 msgstr "_Koko nimi..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Home"
 msgstr "_Koti"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Job title:"
 msgstr "_Teht�v�nimike:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Manager's Name:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Mobile"
 msgstr "_Matkapuhelin"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Nickname:"
 msgstr "_Kutsumanimi:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Office:"
 msgstr "_Asema:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Profession:"
 msgstr "_Ammatti:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#, fuzzy
+msgid "_Public Calendar URL:"
+msgstr "Kalenteri"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Spouse:"
 msgstr "Puoli_so:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_This is the mailing address"
 msgstr "_T�m� on postitusosoite"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "_Web page address:"
 msgstr "Kotisivun osoite:"
@@ -2518,7 +2524,7 @@ msgstr " %d sekuntia"
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
 #: addressbook/gui/widgets/e-addressbook-view.c:691
 #: addressbook/gui/widgets/e-addressbook-view.c:753
-#: addressbook/gui/widgets/e-addressbook-view.c:1373
+#: addressbook/gui/widgets/e-addressbook-view.c:1422
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr ""
@@ -2576,8 +2582,8 @@ msgid "Success"
 msgstr "L�hteet"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1710
-#: shell/e-storage.c:515
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1702
+#: shell/e-storage.c:520
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
@@ -2586,7 +2592,7 @@ msgstr "Tuntematon virhe"
 msgid "Repository offline"
 msgstr "Ty�skentele poissa linjoilta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:505
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:510
 msgid "Permission denied"
 msgstr ""
 
@@ -2603,10 +2609,10 @@ msgid "Protocol not supported"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:733 calendar/gui/calendar-model.c:1274
+#: calendar/gui/calendar-model.c:726 calendar/gui/calendar-model.c:1247
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:544
-#: camel/camel-service.c:580
+#: calendar/gui/e-calendar-table.c:461 camel/camel-service.c:598
+#: camel/camel-service.c:634
 msgid "Cancelled"
 msgstr "Peruutettu"
 
@@ -2636,7 +2642,7 @@ msgid "Error removing list"
 msgstr "Virhe %s:n lataamisessa"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1248
+#: addressbook/gui/widgets/e-addressbook-view.c:1297
 #, fuzzy
 msgid "Error removing card"
 msgstr "Virhe %s:n lataamisessa"
@@ -2908,8 +2914,8 @@ msgstr "Kirjasin..."
 msgid "Print cards"
 msgstr "Tulosta kalenteri"
 
-#: addressbook/printing/e-contact-print.c:1112
-#: addressbook/printing/e-contact-print.c:1134
+#: addressbook/printing/e-contact-print.c:1152
+#: addressbook/printing/e-contact-print.c:1174
 #, fuzzy
 msgid "Print card"
 msgstr "Tulosta kalenteri"
@@ -2920,18 +2926,44 @@ msgstr "Tulosta kalenteri"
 msgid "Print envelope"
 msgstr "Tulostuksen esikatselu"
 
-#: calendar/conduits/calendar/calendar-conduit.c:735
-#: calendar/conduits/todo/todo-conduit.c:548
+#: calendar/cal-util/cal-util.c:418 calendar/cal-util/cal-util.c:440
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:385 mail/message-list.c:652
+msgid "High"
+msgstr "Korkea"
+
+#: calendar/cal-util/cal-util.c:420 calendar/cal-util/cal-util.c:442
+#: calendar/gui/calendar-model.c:1673
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:386 mail/message-list.c:651
+msgid "Normal"
+msgstr "Tavallinen"
+
+#: calendar/cal-util/cal-util.c:422 calendar/cal-util/cal-util.c:444
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:387 mail/message-list.c:650
+msgid "Low"
+msgstr "Matala"
+
+#. An empty string is the same as 'None'.
+#: calendar/cal-util/cal-util.c:438
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:388
+msgid "Undefined"
+msgstr "M��rittelem�t�n"
+
+#: calendar/conduits/calendar/calendar-conduit.c:793
+#: calendar/conduits/todo/todo-conduit.c:564
 msgid "Error while communicating with calendar server"
 msgstr "Virhe kommunikoitaessa kalenteripalvelimen kanssa"
 
-#: calendar/conduits/calendar/calendar-conduit.c:839
-#: calendar/conduits/calendar/calendar-conduit.c:842
+#: calendar/conduits/calendar/calendar-conduit.c:896
+#: calendar/conduits/calendar/calendar-conduit.c:899
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:653
-#: calendar/conduits/todo/todo-conduit.c:656
+#: calendar/conduits/todo/todo-conduit.c:668
+#: calendar/conduits/todo/todo-conduit.c:671
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
@@ -2979,45 +3011,45 @@ msgstr ""
 msgid "Factory for the alarm notification service"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:152
 #, c-format
 msgid "Notification about your appointment starting on %s and ending on %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:156
 #, c-format
 msgid "Notification about your appointment starting on %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:161
 #, c-format
 msgid "Notification about your appointment ending on %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:165
 msgid "Notification about your appointment"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:172
 #, c-format
 msgid "Notification about your task starting on %s and ending on %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:176
 #, c-format
 msgid "Notification about your task starting on %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:181
 #, c-format
 msgid "Notification about your task ending on %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:185
 msgid "Notification about your task"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:267
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr ""
 
@@ -3104,7 +3136,7 @@ msgstr "%A, %e %B %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: calendar/gui/calendar-commands.c:467
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1442
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1446
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -3113,17 +3145,17 @@ msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:399 calendar/gui/calendar-model.c:1001
-#: calendar/gui/e-calendar-table.c:307
+#: calendar/gui/calendar-model.c:399 calendar/gui/calendar-model.c:994
+#: calendar/gui/e-calendar-table.c:364
 msgid "Private"
 msgstr "Henkil�kohtainen"
 
-#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:1003
-#: calendar/gui/e-calendar-table.c:308
+#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:996
+#: calendar/gui/e-calendar-table.c:365
 msgid "Confidential"
 msgstr "Luottamuksellinen"
 
-#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:306
+#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:363
 msgid "Public"
 msgstr "Julkinen"
 
@@ -3143,68 +3175,49 @@ msgstr "I"
 msgid "W"
 msgstr "L"
 
-#: calendar/gui/calendar-model.c:538 calendar/gui/calendar-model.c:1183
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:652
-msgid "High"
-msgstr "Korkea"
-
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1185
-#: calendar/gui/calendar-model.c:1700
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:651
-msgid "Normal"
-msgstr "Tavallinen"
-
-#: calendar/gui/calendar-model.c:542 calendar/gui/calendar-model.c:1187
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:650
-msgid "Low"
-msgstr "Matala"
-
-#: calendar/gui/calendar-model.c:573 calendar/gui/calendar-model.c:1220
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/calendar-model.c:566 calendar/gui/calendar-model.c:1193
+#: calendar/gui/e-calendar-table.c:437
 #, fuzzy
 msgid "Free"
 msgstr "Pe"
 
-#: calendar/gui/calendar-model.c:575 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/calendar-model.c:568 calendar/gui/e-calendar-table.c:438
 #: calendar/gui/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:724 calendar/gui/calendar-model.c:1268
+#: calendar/gui/calendar-model.c:717 calendar/gui/calendar-model.c:1241
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:401
+#: calendar/gui/e-calendar-table.c:458
 msgid "Not Started"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:727 calendar/gui/calendar-model.c:1270
+#: calendar/gui/calendar-model.c:720 calendar/gui/calendar-model.c:1243
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:402
+#: calendar/gui/e-calendar-table.c:459
 msgid "In Progress"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:730 calendar/gui/calendar-model.c:1272
+#: calendar/gui/calendar-model.c:723 calendar/gui/calendar-model.c:1245
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-meeting-model.c:298
+#: calendar/gui/e-calendar-table.c:460 calendar/gui/e-meeting-model.c:298
 #: calendar/gui/e-meeting-model.c:321
 msgid "Completed"
 msgstr ""
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:915 e-util/e-time-utils.c:163
+#: calendar/gui/calendar-model.c:908 e-util/e-time-utils.c:163
 #: e-util/e-time-utils.c:354
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:918 e-util/e-time-utils.c:158
+#: calendar/gui/calendar-model.c:911 e-util/e-time-utils.c:158
 #: e-util/e-time-utils.c:363
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:923
+#: calendar/gui/calendar-model.c:916
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -3215,56 +3228,43 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:1087
+#: calendar/gui/calendar-model.c:1080
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1127
+#: calendar/gui/calendar-model.c:1120
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1168
-msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
-msgstr ""
-"Prioriteetin tulee olla 'Korkea', 'Tavallinen', 'Matala' tai "
-"'M��rittelem�t�n'."
-
-#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1181
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:331
-msgid "Undefined"
-msgstr "M��rittelem�t�n"
-
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1266 calendar/gui/dialogs/meeting-page.c:332
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1444
+#: calendar/gui/calendar-model.c:1239 calendar/gui/dialogs/meeting-page.c:332
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1446
 #: mail/mail-accounts.c:143 mail/mail-accounts.c:390
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:50
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:203
-#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
-#: widgets/misc/e-dateedit.c:1428 widgets/misc/e-dateedit.c:1543
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:453
+#: widgets/misc/e-dateedit.c:1453 widgets/misc/e-dateedit.c:1568
 msgid "None"
 msgstr "M��rittelem�t�n"
 
-#: calendar/gui/calendar-model.c:1702
+#: calendar/gui/calendar-model.c:1675
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1704
+#: calendar/gui/calendar-model.c:1677
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1710 calendar/gui/e-meeting-model.c:270
+#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:270
 #: calendar/gui/e-meeting-model.c:280 calendar/gui/e-meeting-model.c:506
 #: calendar/gui/e-meeting-model.c:702
 msgid "Yes"
 msgstr "Kyll�"
 
-#: calendar/gui/calendar-model.c:1710 calendar/gui/e-meeting-model.c:282
+#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:282
 #: calendar/gui/e-meeting-model.c:703
 msgid "No"
 msgstr "Ei"
@@ -3306,40 +3306,40 @@ msgstr "Kommentti sis�lt��"
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/component-factory.c:62 my-evolution/my-evolution.glade.h:6
+#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:6
 #: shell/e-local-storage.c:172 shell/e-shortcuts.c:1056
 msgid "Calendar"
 msgstr "Kalenteri"
 
-#: calendar/gui/component-factory.c:63
+#: calendar/gui/component-factory.c:64
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/component-factory.c:67 calendar/gui/print.c:1719
-#: my-evolution/e-summary-tasks.c:215 my-evolution/e-summary-tasks.c:231
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1723
+#: my-evolution/e-summary-tasks.c:237 my-evolution/e-summary-tasks.c:253
 #: shell/e-local-storage.c:178 shell/e-shortcuts.c:1059
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Teht�v�t"
 
-#: calendar/gui/component-factory.c:68
+#: calendar/gui/component-factory.c:69
 msgid "Folder containing to-do items"
 msgstr ""
 
-#: calendar/gui/component-factory.c:593 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:581 ui/evolution-calendar.xml.h:7
 msgid "Create a new appointment"
 msgstr "Luo uusi tapaaminen"
 
-#: calendar/gui/component-factory.c:594 calendar/gui/e-day-view.c:3420
+#: calendar/gui/component-factory.c:582 calendar/gui/e-day-view.c:3422
 msgid "New _Appointment"
 msgstr "Uusi t_apaaminen"
 
-#: calendar/gui/component-factory.c:599 ui/evolution-calendar.xml.h:8
+#: calendar/gui/component-factory.c:587 ui/evolution-calendar.xml.h:8
 #: ui/evolution-tasks.xml.h:5
 msgid "Create a new task"
 msgstr "Luo uusi teht�v�"
 
-#: calendar/gui/component-factory.c:600
+#: calendar/gui/component-factory.c:588
 #, fuzzy
 msgid "New _Task"
 msgstr "Uusi teht�v�"
@@ -3419,105 +3419,125 @@ msgstr "tuntia"
 msgid "minutes"
 msgstr "minuutti"
 
-#: calendar/gui/dialogs/alarm-page.c:303
+#: calendar/gui/dialogs/alarm-page.c:307
 #, fuzzy, c-format
 msgid "%d days"
 msgstr " %d p�iv��"
 
-#: calendar/gui/dialogs/alarm-page.c:305
+#: calendar/gui/dialogs/alarm-page.c:310
 #, fuzzy
 msgid "1 day"
 msgstr " 1 p�iv�"
 
-#: calendar/gui/dialogs/alarm-page.c:308
+#: calendar/gui/dialogs/alarm-page.c:315
 #, fuzzy, c-format
 msgid "%d weeks"
 msgstr " %d viikkoa"
 
-#: calendar/gui/dialogs/alarm-page.c:310
+#: calendar/gui/dialogs/alarm-page.c:318
 #, fuzzy
 msgid "1 week"
 msgstr " 1 viikko"
 
-#: calendar/gui/dialogs/alarm-page.c:313
+#: calendar/gui/dialogs/alarm-page.c:323
 #, fuzzy, c-format
 msgid "%d hours"
 msgstr " %d tuntia"
 
-#: calendar/gui/dialogs/alarm-page.c:315
+#: calendar/gui/dialogs/alarm-page.c:326
 #, fuzzy
 msgid "1 hour"
 msgstr " 1 tunti"
 
-#: calendar/gui/dialogs/alarm-page.c:318
+#: calendar/gui/dialogs/alarm-page.c:331
 #, fuzzy, c-format
 msgid "%d minutes"
 msgstr " %d minuuttia"
 
-#: calendar/gui/dialogs/alarm-page.c:320
+#: calendar/gui/dialogs/alarm-page.c:334
 #, fuzzy
 msgid "1 minute"
 msgstr " 1 minuutti"
 
-#: calendar/gui/dialogs/alarm-page.c:323
+#: calendar/gui/dialogs/alarm-page.c:339
 #, fuzzy, c-format
 msgid "%d seconds"
 msgstr " %d sekuntia"
 
-#: calendar/gui/dialogs/alarm-page.c:325
+#: calendar/gui/dialogs/alarm-page.c:342
 #, fuzzy
 msgid "1 second"
 msgstr " 1 sekunti"
 
-#: calendar/gui/dialogs/alarm-page.c:350
+#: calendar/gui/dialogs/alarm-page.c:373
 #: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:354
+#: calendar/gui/dialogs/alarm-page.c:377
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 #, fuzzy
 msgid "Display a message"
 msgstr "Kirjoita viesti"
 
-#: calendar/gui/dialogs/alarm-page.c:358
+#: calendar/gui/dialogs/alarm-page.c:381
 msgid "Send an email"
 msgstr "L�het� s�hk�postia"
 
-#: calendar/gui/dialogs/alarm-page.c:362
+#: calendar/gui/dialogs/alarm-page.c:385
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "Aja ohjelma"
 
-#: calendar/gui/dialogs/alarm-page.c:368 calendar/gui/dialogs/alarm-page.c:404
-#: calendar/gui/e-meeting-model.c:226 calendar/gui/e-meeting-model.c:261
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:674
-#: calendar/gui/e-meeting-model.c:690
-#: camel/providers/smtp/camel-smtp-transport.c:224
-#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
-msgid "Unknown"
-msgstr "Tuntematon"
+#: calendar/gui/dialogs/alarm-page.c:391
+msgid "Unknown action to be performed"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:380
-#, fuzzy
-msgid "before start of appointment"
+#: calendar/gui/dialogs/alarm-page.c:403
+#, fuzzy, c-format
+msgid "%s %s before the start of the appointment"
 msgstr "Luo uusi tapaaminen"
 
-#: calendar/gui/dialogs/alarm-page.c:383
-#, fuzzy
-msgid "after start of appointment"
+#: calendar/gui/dialogs/alarm-page.c:406
+#, fuzzy, c-format
+msgid "%s %s after the start of the appointment"
 msgstr "Luo uusi tapaaminen"
 
-#: calendar/gui/dialogs/alarm-page.c:393
-#, fuzzy
-msgid "before end of appointment"
-msgstr "Muistuta minua kaikista tapaamisista"
+#: calendar/gui/dialogs/alarm-page.c:411
+#, fuzzy, c-format
+msgid "%s at the start of the appointment"
+msgstr "Luo uusi tapaaminen"
 
-#: calendar/gui/dialogs/alarm-page.c:396
-#, fuzzy
-msgid "after end of appointment"
+#: calendar/gui/dialogs/alarm-page.c:420
+#, fuzzy, c-format
+msgid "%s %s before the end of the appointment"
+msgstr "Luo uusi tapaaminen"
+
+#: calendar/gui/dialogs/alarm-page.c:423
+#, fuzzy, c-format
+msgid "%s %s after the end of the appointment"
 msgstr "Luo uusi tapaaminen"
 
+#: calendar/gui/dialogs/alarm-page.c:428
+#, fuzzy, c-format
+msgid "%s at the end of the appointment"
+msgstr "Luo uusi tapaaminen"
+
+#: calendar/gui/dialogs/alarm-page.c:439
+#, fuzzy, c-format
+msgid "%s at an unknown time"
+msgstr "Tuntematon virhe"
+
+#: calendar/gui/dialogs/alarm-page.c:445
+#, c-format
+msgid "%s at %s"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:452
+#, c-format
+msgid "%s for an unknown trigger type"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3867,57 +3887,57 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:159 calendar/gui/print.c:2128
+#: calendar/gui/dialogs/comp-editor-util.c:167 calendar/gui/print.c:2132
 msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:163 calendar/gui/print.c:2132
+#: calendar/gui/dialogs/comp-editor-util.c:171 calendar/gui/print.c:2136
 #, fuzzy
 msgid " (Completed "
 msgstr "Valmis"
 
-#: calendar/gui/dialogs/comp-editor-util.c:165 calendar/gui/print.c:2134
+#: calendar/gui/dialogs/comp-editor-util.c:173 calendar/gui/print.c:2138
 #, fuzzy
 msgid "Completed "
 msgstr "Valmis"
 
-#: calendar/gui/dialogs/comp-editor-util.c:170 calendar/gui/print.c:2139
+#: calendar/gui/dialogs/comp-editor-util.c:178 calendar/gui/print.c:2143
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2141
+#: calendar/gui/dialogs/comp-editor-util.c:180 calendar/gui/print.c:2145
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:515
+#: calendar/gui/dialogs/comp-editor.c:521
 msgid "Edit Appointment"
 msgstr "Muokkaa tapaamista"
 
-#: calendar/gui/dialogs/comp-editor.c:520
+#: calendar/gui/dialogs/comp-editor.c:526
 #, c-format
 msgid "Appointment - %s"
 msgstr "Tapaaminen - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:523
+#: calendar/gui/dialogs/comp-editor.c:529
 #, c-format
 msgid "Task - %s"
 msgstr "Teht�v� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:526
+#: calendar/gui/dialogs/comp-editor.c:532
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:540
+#: calendar/gui/dialogs/comp-editor.c:546
 msgid "No summary"
 msgstr "Ei kuvausta"
 
-#: calendar/gui/dialogs/comp-editor.c:950 mail/mail-callbacks.c:1662
+#: calendar/gui/dialogs/comp-editor.c:952 mail/mail-callbacks.c:1671
 #: mail/mail-display.c:100
 msgid "Overwrite file?"
 msgstr "Kirjoita tiedoston yli?"
 
-#: calendar/gui/dialogs/comp-editor.c:954 mail/mail-callbacks.c:1668
+#: calendar/gui/dialogs/comp-editor.c:956 mail/mail-callbacks.c:1677
 #: mail/mail-display.c:104
 msgid ""
 "A file by that name already exists.\n"
@@ -3926,53 +3946,53 @@ msgstr ""
 "Saman niminen tiedosto on jo olemassa.\n"
 "Kirjoitetaanko sen yli?"
 
-#: calendar/gui/dialogs/comp-editor.c:1017 ui/evolution-comp-editor.xml.h:13
+#: calendar/gui/dialogs/comp-editor.c:1019 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "Tallenna nimell�..."
 
-#: calendar/gui/dialogs/comp-editor.c:1170
+#: calendar/gui/dialogs/comp-editor.c:1172
 msgid "Unable to obtain current version!"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:90
+#: calendar/gui/dialogs/delete-comp.c:91
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Haluatko todella poistaa tapaamisen '%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:93
+#: calendar/gui/dialogs/delete-comp.c:94
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Haluatko todella poistaa t�m�n nimett�m�n tapaamisen?"
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:100
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Haluatko todella poistaa teht�v�n '%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:102
+#: calendar/gui/dialogs/delete-comp.c:103
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Haluatko todella poistaa t�m�n nimett�m�n teht�v�n?"
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:109
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:111
+#: calendar/gui/dialogs/delete-comp.c:112
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:126
+#: calendar/gui/dialogs/delete-comp.c:127
 #, fuzzy, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Haluatko todella poistaa tapaamisen '%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:131
+#: calendar/gui/dialogs/delete-comp.c:132
 #, fuzzy, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Haluatko todella poistaa teht�v�n '%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:136
+#: calendar/gui/dialogs/delete-comp.c:137
 #, fuzzy, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Haluatko varmasti poistaa t�m�n tilin?"
@@ -4169,7 +4189,7 @@ msgstr "Tila"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:18
-#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:85
+#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:86
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Tyyppi"
@@ -4193,8 +4213,8 @@ msgstr ""
 msgid "_Other Organizer"
 msgstr "Organisoija:"
 
-#: calendar/gui/dialogs/recurrence-page.c:422 calendar/gui/print.c:1851
-#: calendar/gui/print.c:1853 calendar/gui/print.c:1854
+#: calendar/gui/dialogs/recurrence-page.c:422 calendar/gui/print.c:1855
+#: calendar/gui/print.c:1857 calendar/gui/print.c:1858
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
@@ -4315,7 +4335,7 @@ msgid "Progress"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:910
+#: my-evolution/e-summary-preferences.c:949
 msgid "URL:"
 msgstr "URL:"
 
@@ -4335,7 +4355,7 @@ msgstr "Tapaaminen"
 
 #: calendar/gui/dialogs/task-page.glade.h:4
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:28
 msgid "Description:"
 msgstr "Kuvaus:"
 
@@ -4351,108 +4371,108 @@ msgstr "_Luottamuksellinen"
 msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:350
+#: calendar/gui/e-calendar-table.c:407
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:351
+#: calendar/gui/e-calendar-table.c:408
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:409
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:410
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:411
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:412
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:356
+#: calendar/gui/e-calendar-table.c:413
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:357
+#: calendar/gui/e-calendar-table.c:414
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:358
+#: calendar/gui/e-calendar-table.c:415
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:359
+#: calendar/gui/e-calendar-table.c:416
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:360
+#: calendar/gui/e-calendar-table.c:417
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3441
-#: calendar/gui/e-week-view.c:3288 mail/folder-browser.c:1336
+#: calendar/gui/e-calendar-table.c:914 calendar/gui/e-day-view.c:3443
+#: calendar/gui/e-week-view.c:3296 mail/folder-browser.c:1371
 #: shell/e-shortcuts-view.c:385
 msgid "_Open"
 msgstr "_Avaa"
 
-#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3450
-#: calendar/gui/e-week-view.c:3297 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:918 calendar/gui/e-day-view.c:3452
+#: calendar/gui/e-week-view.c:3305 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:856 calendar/gui/e-day-view.c:3452
-#: calendar/gui/e-week-view.c:3299 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:920 calendar/gui/e-day-view.c:3454
+#: calendar/gui/e-week-view.c:3307 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:14
 msgid "_Copy"
 msgstr "_Kopioi"
 
-#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3427
-#: calendar/gui/e-day-view.c:3454 calendar/gui/e-week-view.c:3275
-#: calendar/gui/e-week-view.c:3301 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:922 calendar/gui/e-day-view.c:3429
+#: calendar/gui/e-day-view.c:3456 calendar/gui/e-week-view.c:3283
+#: calendar/gui/e-week-view.c:3309 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:40 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:17
 msgid "_Paste"
 msgstr "L_iit�"
 
-#: calendar/gui/e-calendar-table.c:863
+#: calendar/gui/e-calendar-table.c:927
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "Valmis"
 
-#: calendar/gui/e-calendar-table.c:865
+#: calendar/gui/e-calendar-table.c:929
 #, fuzzy
 msgid "_Delete this Task"
 msgstr "Poista t�m� teht�v�"
 
-#: calendar/gui/e-calendar-table.c:868
+#: calendar/gui/e-calendar-table.c:932
 msgid "_Mark Tasks as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:870
+#: calendar/gui/e-calendar-table.c:934
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Poista teht�v�"
 
-#: calendar/gui/e-calendar-table.c:1130
+#: calendar/gui/e-calendar-table.c:1194
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr ""
@@ -4461,8 +4481,8 @@ msgstr ""
 msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:702
-#: camel/camel-filter-driver.c:819
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:718
+#: camel/camel-filter-driver.c:834
 msgid "Complete"
 msgstr "Valmis"
 
@@ -4493,8 +4513,8 @@ 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:30 shell/e-shortcuts.c:1050
-#: shell/e-storage-set-view.c:1424 shell/e-summary-storage.c:80
+#: my-evolution/component-factory.c:45 shell/e-shortcuts.c:1050
+#: shell/e-storage-set-view.c:1420 shell/e-summary-storage.c:80
 msgid "Summary"
 msgstr "Kuvaus"
 
@@ -4514,7 +4534,7 @@ 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:285 calendar/gui/e-day-view.c:1374
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1458
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -4526,290 +4546,307 @@ 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:608 calendar/gui/e-week-view.c:344
-#: calendar/gui/print.c:765
+#: calendar/gui/e-day-view.c:608 calendar/gui/e-week-view.c:345
+#: calendar/gui/print.c:769
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:347
-#: calendar/gui/print.c:767
+#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:348
+#: calendar/gui/print.c:771
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3422 calendar/gui/e-week-view.c:3270
+#: calendar/gui/e-day-view.c:3424 calendar/gui/e-week-view.c:3278
 msgid "New All Day _Event"
 msgstr "Uusi koko p�_iv�n tapahtuma"
 
-#: calendar/gui/e-day-view.c:3432 calendar/gui/e-week-view.c:3280
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3288
 #: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3282
+#: calendar/gui/e-day-view.c:3436 calendar/gui/e-week-view.c:3290
 msgid "_Go to Date..."
 msgstr "Siirry _p�iv��n..."
 
-#: calendar/gui/e-day-view.c:3443 calendar/gui/e-week-view.c:3290
+#: calendar/gui/e-day-view.c:3445 calendar/gui/e-week-view.c:3298
 msgid "_Delete this Appointment"
 msgstr "P_oista t�m� tapaaminen"
 
-#: calendar/gui/e-day-view.c:3462 calendar/gui/e-week-view.c:3315
+#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3323
 msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3317
+#: calendar/gui/e-day-view.c:3466 calendar/gui/e-week-view.c:3325
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3466 calendar/gui/e-week-view.c:3319
+#: calendar/gui/e-day-view.c:3468 calendar/gui/e-week-view.c:3327
 msgid "Delete _All Occurrences"
 msgstr ""
 
+#: calendar/gui/e-itip-control.c:469
+msgid "Meeting begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:474
+msgid "Task begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:479
+#, fuzzy
+msgid "Free/Busy info begins: <b>"
+msgstr "L�hteen tiedot"
+
+#: calendar/gui/e-itip-control.c:483
+msgid "Begins: <b>"
+msgstr ""
+
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:677
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:664
+#: calendar/gui/e-itip-control.c:692
 #, c-format
 msgid "<b>Summary:</b> %s<br><br>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:664
+#: calendar/gui/e-itip-control.c:692
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:674
+#: calendar/gui/e-itip-control.c:702
 #, fuzzy, c-format
 msgid "<b>Description:</b> %s"
 msgstr "Kuvaus:"
 
-#: calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:737
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:738
 #, fuzzy
 msgid "Meeting Information"
 msgstr "Valinnaiset tiedot"
 
-#: calendar/gui/e-itip-control.c:715
+#: calendar/gui/e-itip-control.c:742
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:716
+#: calendar/gui/e-itip-control.c:743
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-itip-control.c:747
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:721
+#: calendar/gui/e-itip-control.c:748
 #, fuzzy
 msgid "Meeting Update"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/e-itip-control.c:725
+#: calendar/gui/e-itip-control.c:752
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:726
+#: calendar/gui/e-itip-control.c:753
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:730
+#: calendar/gui/e-itip-control.c:757
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:731
+#: calendar/gui/e-itip-control.c:758
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/e-itip-control.c:735
+#: calendar/gui/e-itip-control.c:762
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:736
+#: calendar/gui/e-itip-control.c:763
 #, fuzzy
 msgid "Meeting Cancellation"
 msgstr "Valitse toiminto"
 
-#: calendar/gui/e-itip-control.c:740 calendar/gui/e-itip-control.c:788
-#: calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:767 calendar/gui/e-itip-control.c:815
+#: calendar/gui/e-itip-control.c:848
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:741
+#: calendar/gui/e-itip-control.c:768
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "Hae viestist�"
 
-#: calendar/gui/e-itip-control.c:758
+#: calendar/gui/e-itip-control.c:785
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:759
+#: calendar/gui/e-itip-control.c:786
 #, fuzzy
 msgid "Task Information"
 msgstr "Tiedoksi"
 
-#: calendar/gui/e-itip-control.c:763
+#: calendar/gui/e-itip-control.c:790
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:791
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:768
+#: calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:769
+#: calendar/gui/e-itip-control.c:796
 #, fuzzy
 msgid "Task Update"
 msgstr "Teht�v�t"
 
-#: calendar/gui/e-itip-control.c:773
+#: calendar/gui/e-itip-control.c:800
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:774
+#: calendar/gui/e-itip-control.c:801
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:778
+#: calendar/gui/e-itip-control.c:805
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:806
 #, fuzzy
 msgid "Task Reply"
 msgstr "Vastaa"
 
-#: calendar/gui/e-itip-control.c:783
+#: calendar/gui/e-itip-control.c:810
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:784
+#: calendar/gui/e-itip-control.c:811
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "Peruuta operaatio"
 
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:816
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "Hae viestist�"
 
-#: calendar/gui/e-itip-control.c:806
+#: calendar/gui/e-itip-control.c:833
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:807
+#: calendar/gui/e-itip-control.c:834
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "L�hteen tiedot"
 
-#: calendar/gui/e-itip-control.c:811
+#: calendar/gui/e-itip-control.c:838
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:812
+#: calendar/gui/e-itip-control.c:839
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:816
+#: calendar/gui/e-itip-control.c:843
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:817
+#: calendar/gui/e-itip-control.c:844
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:822
+#: calendar/gui/e-itip-control.c:849
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "Edellinen viesti"
 
-#: calendar/gui/e-itip-control.c:889
+#: calendar/gui/e-itip-control.c:916
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:908
+#: calendar/gui/e-itip-control.c:935
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:936 calendar/gui/e-itip-control.c:942
+#: calendar/gui/e-itip-control.c:963 calendar/gui/e-itip-control.c:969
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1088
 #, fuzzy
 msgid "Calendar file could not be updated!\n"
 msgstr "Kohdistimen lataaminen ep�onnistui\n"
 
-#: calendar/gui/e-itip-control.c:1063
+#: calendar/gui/e-itip-control.c:1090
 #, fuzzy
 msgid "Update complete\n"
 msgstr "Valmis"
 
-#: calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.c:1134
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1142
 msgid "Attendee status ould not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1144
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1119
+#: calendar/gui/e-itip-control.c:1146
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1174
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "En pystynyt poistamaan kohtaa kalenteritiedostostasi!\n"
 
-#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-itip-control.c:1176
 #, fuzzy
 msgid "Removal Complete"
 msgstr "Valmis"
 
-#: calendar/gui/e-itip-control.c:1181 calendar/gui/e-itip-control.c:1216
+#: calendar/gui/e-itip-control.c:1208 calendar/gui/e-itip-control.c:1242
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "L�hetetty"
 
-#: calendar/gui/e-itip-control.c:1183 calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1210 calendar/gui/e-itip-control.c:1246
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1380
+#: calendar/gui/e-itip-control.c:1406
 msgid "Unable to find any of your identities in the attendees list!\n"
 msgstr ""
 
@@ -4872,6 +4909,14 @@ msgstr "Paperil�hde:"
 msgid "Room"
 msgstr ""
 
+#: calendar/gui/e-meeting-model.c:226 calendar/gui/e-meeting-model.c:261
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:674
+#: calendar/gui/e-meeting-model.c:690
+#: camel/providers/smtp/camel-smtp-transport.c:224
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
+msgid "Unknown"
+msgstr "Tuntematon"
+
 #: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
 #: calendar/gui/e-meeting-model.c:686
 msgid "Chair"
@@ -4929,14 +4974,14 @@ msgstr "Ammatti"
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:472
-#: calendar/gui/e-meeting-time-sel.c:1936
+#: calendar/gui/e-meeting-time-sel.c:1937
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:476
-#: calendar/gui/e-meeting-time-sel.c:1964 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:1965 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:345
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
@@ -4944,7 +4989,7 @@ msgstr "%a %d/%m/%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:480 e-util/e-time-utils.c:221
-#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1552
+#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1577
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
@@ -5022,16 +5067,16 @@ msgstr ""
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3268 calendar/gui/e-week-view.c:3306
+#: calendar/gui/e-week-view.c:3276 calendar/gui/e-week-view.c:3314
 msgid "New _Appointment..."
 msgstr "Uusi t_apaaminen..."
 
-#: calendar/gui/gnome-cal.c:1318
+#: calendar/gui/gnome-cal.c:1319
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1329
+#: calendar/gui/gnome-cal.c:1330
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
@@ -5101,201 +5146,201 @@ msgstr ""
 msgid "Could not create the component editor factory"
 msgstr "V�liaikaishakemistoa ei voitu luoda: %s"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:432
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "Su"
 msgstr "Su"
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "Mo"
 msgstr "Ma"
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "Tu"
 msgstr "Ti"
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "We"
 msgstr "Ke"
 
-#: calendar/gui/print.c:497
+#: calendar/gui/print.c:500
 msgid "Th"
 msgstr "To"
 
-#: calendar/gui/print.c:497
+#: calendar/gui/print.c:500
 msgid "Fr"
 msgstr "Pe"
 
-#: calendar/gui/print.c:497
+#: calendar/gui/print.c:500
 msgid "Sa"
 msgstr "La"
 
 #. Day
-#: calendar/gui/print.c:1827
+#: calendar/gui/print.c:1831
 msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1846 calendar/gui/print.c:1850
+#: calendar/gui/print.c:1850 calendar/gui/print.c:1854
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1847
+#: calendar/gui/print.c:1851
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1858
+#: calendar/gui/print.c:1862
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1866
+#: calendar/gui/print.c:1870
 msgid "Selected month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1873
+#: calendar/gui/print.c:1877
 msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:2214
+#: calendar/gui/print.c:2221
 msgid "Print Calendar"
 msgstr "Tulosta kalenteri"
 
-#: calendar/gui/print.c:2302 calendar/gui/print.c:2394
-#: mail/mail-callbacks.c:2071 my-evolution/e-summary.c:551
+#: calendar/gui/print.c:2312 calendar/gui/print.c:2404
+#: mail/mail-callbacks.c:2080 my-evolution/e-summary.c:607
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
 msgstr "Tulostuksen esikatselu"
 
-#: calendar/gui/print.c:2331
+#: calendar/gui/print.c:2341
 msgid "Print Item"
 msgstr "Tulosta kohta"
 
-#: calendar/gui/print.c:2412
+#: calendar/gui/print.c:2422
 msgid "Print Setup"
 msgstr "Tulostusasetukset"
 
@@ -5479,65 +5524,80 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr ""
 
-#: camel/camel-disco-store.c:305
+#: camel/camel-disco-store.c:336
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
+#: camel/camel-filter-driver.c:549 camel/camel-filter-driver.c:558
 msgid "Syncing folders"
 msgstr "Synkronoidaan kansiota"
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:659
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:668
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:667
+#: camel/camel-filter-driver.c:683
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Haetaan viesti� %d (%d%%)"
 
-#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
+#: camel/camel-filter-driver.c:687 camel/camel-filter-driver.c:700
 #, c-format
 msgid "Failed on message %d"
 msgstr "Virhe viestin %d kohdalla"
 
-#: camel/camel-filter-driver.c:672
+#: camel/camel-filter-driver.c:688
 msgid "Cannot open message"
 msgstr "Viesti� ei voida avata"
 
-#: camel/camel-filter-driver.c:698 camel/camel-filter-driver.c:814
+#: camel/camel-filter-driver.c:714 camel/camel-filter-driver.c:829
 msgid "Syncing folder"
 msgstr "Synkronoidaan kansiota"
 
-#: camel/camel-filter-driver.c:770
+#: camel/camel-filter-driver.c:786
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Haetaan viesti� %d / %d"
 
-#: camel/camel-filter-driver.c:775 camel/camel-filter-driver.c:793
+#: camel/camel-filter-driver.c:791 camel/camel-filter-driver.c:809
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Virhe viestin %d/%d kohdalla"
 
-#: camel/camel-filter-driver.c:900
+#: camel/camel-filter-driver.c:918
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Virhe j�sennett�ess� suodatinta: %s: %s"
 
-#: camel/camel-filter-driver.c:906
+#: camel/camel-filter-driver.c:924
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Virhe suoritettaessa suodatinta: %s: %s"
 
-#: camel/camel-filter-search.c:479 camel/camel-filter-search.c:486
+#: camel/camel-filter-search.c:494 camel/camel-filter-search.c:501
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
 
+#: camel/camel-folder.c:472
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1039
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1219
+#, fuzzy
+msgid "Moving messages"
+msgstr "L�hetet��n viesti�"
+
 #: camel/camel-folder-search.c:333
 #, c-format
 msgid ""
@@ -5561,7 +5621,7 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:747 camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:748 camel/camel-folder-search.c:792
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
@@ -5660,81 +5720,81 @@ msgstr "Virhe kirjoitettaessa v�liaikaista viestitiedostoa: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Virhe kopioitaessa viestin v�liaikaistiedostoa: %s"
 
-#: camel/camel-pgp-context.c:193
+#: camel/camel-pgp-context.c:191
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:196
+#: camel/camel-pgp-context.c:194
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr ""
 
-#: camel/camel-pgp-context.c:518
+#: camel/camel-pgp-context.c:525
 #, fuzzy
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr "Viesti� ei voida l�hett��: vastaanottajia ei ole m��ritelty."
 
-#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:532 camel/camel-pgp-context.c:706
 #, fuzzy
 msgid "Cannot sign this message: no password provided"
 msgstr "Viesti� ei voida l�hett��: l�hett�j�n osoite on ep�kelpo."
 
-#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:538 camel/camel-pgp-context.c:712
 #, fuzzy, c-format
 msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "Putken luominen GPG/PGP:lle ep�onnistui: %s"
 
-#: camel/camel-pgp-context.c:693
+#: camel/camel-pgp-context.c:699
 #, fuzzy
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr "Viesti� ei voida l�hett��: vastaanottajia ei ole m��ritelty."
 
-#: camel/camel-pgp-context.c:886
+#: camel/camel-pgp-context.c:891
 #, fuzzy
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr "Viesti� ei voida l�hett��: vastaanottajia ei ole m��ritelty."
 
-#: camel/camel-pgp-context.c:892
+#: camel/camel-pgp-context.c:897
 #, fuzzy, c-format
 msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "Putken luominen GPG/PGP:lle ep�onnistui: %s"
 
-#: camel/camel-pgp-context.c:903
+#: camel/camel-pgp-context.c:908
 #, fuzzy, c-format
 msgid "Cannot verify this message: couldn't create temp file: %s"
 msgstr "V�liaikaistiedostoa ei voitu luoda: %s"
 
-#: camel/camel-pgp-context.c:1069
+#: camel/camel-pgp-context.c:1076
 #, fuzzy
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr "Viesti� ei voida l�hett��: vastaanottajia ei ole m��ritelty."
 
-#: camel/camel-pgp-context.c:1079
+#: camel/camel-pgp-context.c:1086
 #, fuzzy
 msgid "Cannot encrypt this message: no password provided"
 msgstr "Viesti� ei voida l�hett��: l�hett�j�n osoite on ep�kelpo."
 
-#: camel/camel-pgp-context.c:1086
+#: camel/camel-pgp-context.c:1093
 #, fuzzy, c-format
 msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "Putken luominen GPG/PGP:lle ep�onnistui: %s"
 
-#: camel/camel-pgp-context.c:1095
+#: camel/camel-pgp-context.c:1102
 #, fuzzy
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr "Viesti� ei voida l�hett��: vastaanottajia ei ole m��ritelty."
 
-#: camel/camel-pgp-context.c:1258
+#: camel/camel-pgp-context.c:1264
 #, fuzzy
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr "Viesti� ei voida l�hett��: vastaanottajia ei ole m��ritelty."
 
-#: camel/camel-pgp-context.c:1266
+#: camel/camel-pgp-context.c:1272
 msgid "Cannot decrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1273
+#: camel/camel-pgp-context.c:1279
 #, fuzzy, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "Putken luominen GPG/PGP:lle ep�onnistui: %s"
@@ -5780,13 +5840,13 @@ msgstr ""
 msgid "(unknown host)"
 msgstr ""
 
-#: camel/camel-remote-store.c:361 camel/camel-remote-store.c:423
-#: camel/camel-remote-store.c:486
+#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
+#: camel/camel-remote-store.c:483
 #: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr ""
 
-#: camel/camel-remote-store.c:489
+#: camel/camel-remote-store.c:486
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -5884,7 +5944,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:492
+#: camel/providers/imap/camel-imap-store.c:494
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -5902,7 +5962,7 @@ msgstr "Tuntematon todennustila."
 
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:302
-#: camel/providers/pop3/camel-pop3-provider.c:68 mail/mail-config.glade.h:54
+#: camel/providers/pop3/camel-pop3-provider.c:68 mail/mail-config.glade.h:55
 msgid "Password"
 msgstr "Salasana"
 
@@ -5932,37 +5992,37 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:154
+#: camel/camel-service.c:157
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:162
+#: camel/camel-service.c:165
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:170
+#: camel/camel-service.c:173
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:548
+#: camel/camel-service.c:602
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:575
+#: camel/camel-service.c:629
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:600
+#: camel/camel-service.c:654
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:602
+#: camel/camel-service.c:656
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
@@ -5975,12 +6035,12 @@ msgstr ""
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:322 camel/camel-session.c:391
+#: camel/camel-session.c:324 camel/camel-session.c:393
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:508
+#: camel/camel-session.c:510
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -6031,7 +6091,7 @@ msgstr ""
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: camel/camel-tcp-stream-openssl.c:463
+#: camel/camel-tcp-stream-openssl.c:491
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -6039,7 +6099,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:369
+#: camel/camel-tcp-stream-openssl.c:496 camel/camel-tcp-stream-ssl.c:369
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -6066,17 +6126,37 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "URL:n `%s' j�sent�minen ep�onnistui"
 
-#: camel/camel-vee-folder.c:546
+#: camel/camel-vee-folder.c:554
 #, c-format
 msgid "No such message %s in %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:641
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message: %s"
 msgstr "Ei kyseist� viesti�: %s"
 
-#: camel/camel-vtrash-folder.c:106
+#: camel/camel-vee-store.c:250
+#, fuzzy, c-format
+msgid "Cannot delete folder: %s: Invalid operation"
+msgstr "Kansion hakeminen ei onnistu: %s: %s"
+
+#: camel/camel-vee-store.c:286
+#, fuzzy, c-format
+msgid "Cannot delete folder: %s: No such folder"
+msgstr "Kansion hakeminen ei onnistu: %s: %s"
+
+#: camel/camel-vee-store.c:298
+#, fuzzy, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "Kansion hakeminen ei onnistu: %s: %s"
+
+#: camel/camel-vee-store.c:326
+#, fuzzy, c-format
+msgid "Cannot rename folder: %s: No such folder"
+msgstr "Kansion hakeminen ei onnistu: %s: %s"
+
+#: camel/camel-vtrash-folder.c:109
 msgid "You cannot copy messages from this trash folder."
 msgstr "Et voi kopioida viestej� t�st� roskakorista."
 
@@ -6124,7 +6204,7 @@ msgid "Scanning for changed messages"
 msgstr "Etsit��n muuttuneita viestej�"
 
 #: camel/providers/imap/camel-imap-folder.c:1491
-#: camel/providers/imap/camel-imap-folder.c:1890
+#: camel/providers/imap/camel-imap-folder.c:1899
 msgid "This message is not currently available"
 msgstr "T�t� viesti� ei ole juuri nyt saatavilla"
 
@@ -6137,7 +6217,7 @@ msgstr ""
 msgid "Scanning for new messages"
 msgstr "Etsit��n uusia viestej�"
 
-#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/imap/camel-imap-folder.c:1936
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -6154,7 +6234,7 @@ msgstr "V�limuistihakemistoa ei voitu avata: %s"
 msgid "Failed to cache message %s: %s"
 msgstr "Viestin salauksen purkaminen ep�onnistui."
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:14
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:15
 msgid "Checking for new mail"
 msgstr "Tarkastetaan onko uutta s�hk�postia"
 
@@ -6162,7 +6242,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:733
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:767
 msgid "Folders"
 msgstr "Kansiot"
 
@@ -6195,28 +6275,28 @@ msgstr ""
 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:515
+#: camel/providers/imap/camel-imap-store.c:517
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:525
+#: camel/providers/imap/camel-imap-store.c:527
 #: camel/providers/smtp/camel-smtp-transport.c:388
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap/camel-imap-store.c:551
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:566
 #: camel/providers/smtp/camel-smtp-transport.c:432
 msgid "You didn't enter a password."
 msgstr "Et antanut salasanaa."
 
-#: camel/providers/imap/camel-imap-store.c:590
+#: camel/providers/imap/camel-imap-store.c:592
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6224,12 +6304,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:889
+#: camel/providers/imap/camel-imap-store.c:891
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1090
+#: camel/providers/imap/camel-imap-store.c:1131
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -6262,51 +6342,51 @@ msgstr ""
 msgid "For storing local mail in qmail maildir directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:77
+#: camel/providers/local/camel-local-provider.c:78
 msgid "Standard Unix mbox spools"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:78
+#: camel/providers/local/camel-local-provider.c:79
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:127
-#: camel/providers/local/camel-spool-store.c:112
+#: camel/providers/local/camel-local-store.c:132
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:134
+#: camel/providers/local/camel-local-store.c:139
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:142
-#: camel/providers/local/camel-local-store.c:158
+#: camel/providers/local/camel-local-store.c:147
+#: camel/providers/local/camel-local-store.c:163
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:173
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:183
+#: camel/providers/local/camel-local-store.c:190
 #, c-format
 msgid "Local mail file %s"
 msgstr "Paikallinen viestitiedosto %s"
 
-#: camel/providers/local/camel-local-store.c:240
+#: camel/providers/local/camel-local-store.c:247
 #, 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:282
+#: camel/providers/local/camel-local-store.c:289
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:292
+#: camel/providers/local/camel-local-store.c:299
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
@@ -6582,26 +6662,26 @@ msgstr ""
 msgid "Cannot append message to spool file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:133
+#: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Spool `%s' does not exist or is not a regular file"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:159
+#: camel/providers/local/camel-spool-store.c:142
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Kansiota `%s/%s' ei ole olemassa."
 
-#: camel/providers/local/camel-spool-store.c:181
+#: camel/providers/local/camel-spool-store.c:164
 #, c-format
 msgid "Spool mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:227
+#: camel/providers/local/camel-spool-store.c:210
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:235
+#: camel/providers/local/camel-spool-store.c:218
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
@@ -6726,31 +6806,31 @@ msgstr "Haetaan POP-yhteenvetoa"
 msgid "Could not check POP server for new messages: %s"
 msgstr "Uusien viestien haku POP-palvelimelta ep�onnistui: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:235
+#: camel/providers/pop3/camel-pop3-folder.c:242
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:259
+#: camel/providers/pop3/camel-pop3-folder.c:266
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "Leikkaa valitut viestit"
 
-#: camel/providers/pop3/camel-pop3-folder.c:335
+#: camel/providers/pop3/camel-pop3-folder.c:342
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "Viestin hakeminen ep�onnistui: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:351
+#: camel/providers/pop3/camel-pop3-folder.c:358
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Viesti� ei saatu POP-palvelimelta %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:374
+#: camel/providers/pop3/camel-pop3-folder.c:381
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:378
+#: camel/providers/pop3/camel-pop3-folder.c:385
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Haetaan POP-viesti� %d"
@@ -6768,7 +6848,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:51 mail/mail-config.glade.h:53
+#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:54
 msgid "POP"
 msgstr "POP"
 
@@ -6850,7 +6930,7 @@ msgid "Unexpected response from POP server: %s"
 msgstr "Odottamaton vastaus IMAP-palvelimelta: %s"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:73
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -6902,7 +6982,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:66
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -7526,13 +7606,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:309 e-util/e-time-utils.c:396
-#: widgets/misc/e-dateedit.c:1360 widgets/misc/e-dateedit.c:1587
+#: widgets/misc/e-dateedit.c:1385 widgets/misc/e-dateedit.c:1612
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:313 e-util/e-time-utils.c:388
-#: widgets/misc/e-dateedit.c:1357 widgets/misc/e-dateedit.c:1584
+#: widgets/misc/e-dateedit.c:1382 widgets/misc/e-dateedit.c:1609
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -7673,8 +7753,8 @@ msgid ""
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:232 filter/vfolder-rule.c:351
-#: mail/mail-account-gui.c:820
+#: filter/filter-folder.c:232 filter/vfolder-rule.c:356
+#: mail/mail-account-gui.c:822
 msgid "Select Folder"
 msgstr ""
 
@@ -7922,7 +8002,7 @@ msgstr ""
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1242
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1251
 msgid "Sender"
 msgstr "L�hett�j�"
 
@@ -7954,7 +8034,7 @@ msgstr "alkaa merkkijonolla"
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:893
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:917
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Aihe"
@@ -7983,7 +8063,7 @@ msgstr "Muokkaa s��nt��"
 msgid "Score Rules"
 msgstr ""
 
-#: filter/vfolder-rule.c:203
+#: filter/vfolder-rule.c:206
 msgid "Oops.  You need to to specify at least one folder as a source."
 msgstr ""
 
@@ -8003,19 +8083,19 @@ msgstr "_Siirry kansioon..."
 msgid "Please wait"
 msgstr "loppuu merkkijonoon"
 
-#: importers/elm-importer.c:171 importers/netscape-importer.c:701
+#: importers/elm-importer.c:171 importers/netscape-importer.c:708
 #: importers/pine-importer.c:369
 #, c-format
 msgid "Importing %s as %s"
 msgstr ""
 
-#: importers/elm-importer.c:377 importers/netscape-importer.c:794
+#: importers/elm-importer.c:377 importers/netscape-importer.c:801
 #: importers/pine-importer.c:506
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "L�hetet��n \"%s\""
 
-#: importers/elm-importer.c:528 importers/netscape-importer.c:967
+#: importers/elm-importer.c:528 importers/netscape-importer.c:974
 #: importers/pine-importer.c:669 mail/component-factory.c:96
 msgid "Mail"
 msgstr ""
@@ -8053,19 +8133,19 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: importers/netscape-importer.c:897 importers/pine-importer.c:602
+#: importers/netscape-importer.c:904 importers/pine-importer.c:602
 msgid "Scanning directory"
 msgstr ""
 
-#: importers/netscape-importer.c:906
+#: importers/netscape-importer.c:913
 msgid "Starting import"
 msgstr ""
 
-#: importers/netscape-importer.c:972
+#: importers/netscape-importer.c:979
 msgid "Settings"
 msgstr "Asetukset"
 
-#: importers/netscape-importer.c:993
+#: importers/netscape-importer.c:1000
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8151,21 +8231,27 @@ msgstr "Ominaisuudet..."
 msgid "Change this folder's properties"
 msgstr "Muuta t�m�n kansion ominaisuuksia"
 
-#: mail/component-factory.c:790
+#: mail/component-factory.c:698
+msgid ""
+"Some of your mail settings seem corrupt, please check that everything is in "
+"order."
+msgstr ""
+
+#: mail/component-factory.c:812
 #, fuzzy
 msgid "New Mail Message"
 msgstr "Seuraava viesti"
 
-#: mail/component-factory.c:790
+#: mail/component-factory.c:812
 #, fuzzy
 msgid "New _Mail Message"
 msgstr "Seuraava viesti"
 
-#: mail/component-factory.c:821
+#: mail/component-factory.c:843
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolutionin s�hk�postikomponentin alustus ep�onnistui."
 
-#: mail/component-factory.c:1007
+#: mail/component-factory.c:1032
 msgid "Cannot register storage with shell"
 msgstr ""
 
@@ -8178,161 +8264,161 @@ msgstr "Kansion \"%s\" ominaisuudet"
 msgid "Properties"
 msgstr "Ominaisuudet"
 
-#: mail/folder-browser.c:239 mail/mail-display.c:275
+#: mail/folder-browser.c:262 mail/mail-display.c:275
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "V�liaikaishakemistoa ei voitu luoda: %s"
 
-#: mail/folder-browser.c:708
+#: mail/folder-browser.c:734
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/folder-browser.c:711 mail/folder-browser.c:716
-#: mail/folder-browser.c:720
+#: mail/folder-browser.c:737 mail/folder-browser.c:742
+#: mail/folder-browser.c:746
 msgid ", "
 msgstr ""
 
-#: mail/folder-browser.c:712
+#: mail/folder-browser.c:738
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/folder-browser.c:717
+#: mail/folder-browser.c:743
 #, fuzzy, c-format
 msgid "%d selected"
 msgstr "Poistettu"
 
-#: mail/folder-browser.c:722
+#: mail/folder-browser.c:748
 #, c-format
 msgid "%d unsent"
 msgstr "%d l�hett�m�t�nt�"
 
-#: mail/folder-browser.c:724
+#: mail/folder-browser.c:750
 #, c-format
 msgid "%d total"
 msgstr "%d yhteens�"
 
-#: mail/folder-browser.c:958
+#: mail/folder-browser.c:993
 #, fuzzy
 msgid "Create vFolder from Search"
 msgstr "_Luo viestist� suodatin"
 
-#: mail/folder-browser.c:1303
+#: mail/folder-browser.c:1338
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/folder-browser.c:1306
+#: mail/folder-browser.c:1341
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:1309
+#: mail/folder-browser.c:1344
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:1312
+#: mail/folder-browser.c:1347
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:1318
+#: mail/folder-browser.c:1353
 msgid "Filter on Sub_ject"
 msgstr "Suodata a_iheen mukaan"
 
-#: mail/folder-browser.c:1321
+#: mail/folder-browser.c:1356
 msgid "Filter on Sen_der"
 msgstr "Suodata _l�hett�j�n mukaan"
 
-#: mail/folder-browser.c:1324
+#: mail/folder-browser.c:1359
 msgid "Filter on Re_cipients"
 msgstr "Suodata _vastaanottajien mukaan"
 
-#: mail/folder-browser.c:1327
+#: mail/folder-browser.c:1362
 msgid "Filter on _Mailing List"
 msgstr "Suodata _postituslistan mukaan"
 
-#: mail/folder-browser.c:1338 ui/evolution-mail-message.xml.h:89
+#: mail/folder-browser.c:1373 ui/evolution-mail-message.xml.h:89
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "Tulosta viesti..."
 
-#: mail/folder-browser.c:1340 ui/evolution-mail-message.xml.h:97
+#: mail/folder-browser.c:1375 ui/evolution-mail-message.xml.h:97
 msgid "_Save As..."
 msgstr "Tallenna _nimell�..."
 
-#: mail/folder-browser.c:1342
+#: mail/folder-browser.c:1377
 msgid "_Print"
 msgstr "_Tulosta"
 
-#: mail/folder-browser.c:1347 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1382 ui/evolution-mail-message.xml.h:96
 msgid "_Reply to Sender"
 msgstr "_Vastaa l�hett�j�lle"
 
-#: mail/folder-browser.c:1349 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1384 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _List"
 msgstr "Vastaa _listalle"
 
-#: mail/folder-browser.c:1351 ui/evolution-mail-message.xml.h:68
+#: mail/folder-browser.c:1386 ui/evolution-mail-message.xml.h:68
 msgid "Reply to _All"
 msgstr "Vastaa k_aikille"
 
-#: mail/folder-browser.c:1353
+#: mail/folder-browser.c:1388
 msgid "_Forward"
 msgstr "_V�lit�"
 
-#: mail/folder-browser.c:1356 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1391 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "Merkitse _luetuksi"
 
-#: mail/folder-browser.c:1358 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1393 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Merkitse luke_mattomaksi"
 
-#: mail/folder-browser.c:1360
+#: mail/folder-browser.c:1395
 msgid "Mark as _Important"
 msgstr "Merkitse t�rke�ks_i"
 
-#: mail/folder-browser.c:1362
+#: mail/folder-browser.c:1397
 msgid "Mark as Unim_portant"
 msgstr ""
 
-#: mail/folder-browser.c:1367
+#: mail/folder-browser.c:1402
 msgid "_Move to Folder..."
 msgstr "_Siirr� kansioon..."
 
-#: mail/folder-browser.c:1369
+#: mail/folder-browser.c:1404
 msgid "_Copy to Folder..."
 msgstr "_Kopioi kansioon..."
 
-#: mail/folder-browser.c:1373 ui/evolution-mail-message.xml.h:99
+#: mail/folder-browser.c:1408 ui/evolution-mail-message.xml.h:99
 msgid "_Undelete"
 msgstr "_Palauta"
 
-#: mail/folder-browser.c:1378
+#: mail/folder-browser.c:1413
 msgid "Add Sender to Address Book"
 msgstr "Lis�� l�hett�j� osoitekirjaan"
 
-#: mail/folder-browser.c:1383
+#: mail/folder-browser.c:1418
 msgid "Apply Filters"
 msgstr "Toteuta suodattimet"
 
-#: mail/folder-browser.c:1387
+#: mail/folder-browser.c:1422
 msgid "Create Ru_le From Message"
 msgstr "_Luo viestist� s��nt�"
 
-#: mail/folder-browser.c:1538
+#: mail/folder-browser.c:1573
 msgid "Filter on Mailing List"
 msgstr "Suodata postituslistan mukaan"
 
-#: mail/folder-browser.c:1539
+#: mail/folder-browser.c:1574
 msgid "VFolder on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1541
+#: mail/folder-browser.c:1576
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Suodata postituslistan mukaan (%s)"
 
-#: mail/folder-browser.c:1542
+#: mail/folder-browser.c:1577
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr ""
@@ -8403,16 +8489,16 @@ msgstr "Evolutionin uutismuokkain"
 msgid "Evolution Account Editor"
 msgstr "Evolutionin tilimuokkain"
 
-#: mail/mail-account-gui.c:945
+#: mail/mail-account-gui.c:947
 #, fuzzy
 msgid "Could not save signature file."
 msgstr "Putken luonti ep�onnistui: %s"
 
-#: mail/mail-account-gui.c:1022
+#: mail/mail-account-gui.c:1024
 msgid "Save signature"
 msgstr "Tallenna allekirjoitus"
 
-#: mail/mail-account-gui.c:1028
+#: mail/mail-account-gui.c:1030
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -8422,7 +8508,7 @@ msgstr ""
 "\n"
 "Haluatko tallentaa muutokset?"
 
-#: mail/mail-account-gui.c:1611
+#: mail/mail-account-gui.c:1615
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -8455,7 +8541,7 @@ msgid "Are you sure you want to delete this news account?"
 msgstr "Haluatko varmasti poistaa t�m�n keskusteluryhm�tilin?"
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:757 mail/mail-config.glade.h:42
+#: mail/mail-accounts.c:760 mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Mail Settings"
 msgstr "_S�hk�postiasetukset..."
@@ -8553,38 +8639,38 @@ msgstr ""
 msgid "This message contains invalid recipients:"
 msgstr ""
 
-#: mail/mail-callbacks.c:453
+#: mail/mail-callbacks.c:454
 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:549
+#: mail/mail-callbacks.c:550
 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:779
+#: mail/mail-callbacks.c:783
 #, fuzzy
 msgid "an unknown sender"
 msgstr "Tuntematon virhe"
 
-#: mail/mail-callbacks.c:784
+#: mail/mail-callbacks.c:788
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1162
+#: mail/mail-callbacks.c:1171
 msgid "Move message(s) to"
 msgstr "Siirr� viesti(t) kansioon"
 
-#: mail/mail-callbacks.c:1164
+#: mail/mail-callbacks.c:1173
 msgid "Copy message(s) to"
 msgstr "Kopioi viesti(t) kansioon"
 
-#: mail/mail-callbacks.c:1538
+#: mail/mail-callbacks.c:1547
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1560
+#: mail/mail-callbacks.c:1569
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -8592,7 +8678,7 @@ msgstr ""
 "Voit muokata vain Luonnokset\n"
 "-kansiossa olevia viestej�."
 
-#: mail/mail-callbacks.c:1594
+#: mail/mail-callbacks.c:1603
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -8600,28 +8686,28 @@ msgstr ""
 "Voit l�hett�� uudelleen vain\n"
 "\"L�hetetyt\"-kansiossa olevia viestej�."
 
-#: mail/mail-callbacks.c:1606
+#: mail/mail-callbacks.c:1615
 #, 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:1627
+#: mail/mail-callbacks.c:1636
 msgid "No Message Selected"
 msgstr "Ei viestej� valittuna"
 
-#: mail/mail-callbacks.c:1712
+#: mail/mail-callbacks.c:1721
 msgid "Save Message As..."
 msgstr "Tallenna viesti nimell�..."
 
-#: mail/mail-callbacks.c:1714
+#: mail/mail-callbacks.c:1723
 msgid "Save Messages As..."
 msgstr "Tallenna viestit nimell�..."
 
-#: mail/mail-callbacks.c:1859 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:1868 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Varoitus"
 
-#: mail/mail-callbacks.c:1864
+#: mail/mail-callbacks.c:1873
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8629,31 +8715,31 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1871
+#: mail/mail-callbacks.c:1880
 #, fuzzy
 msgid "Do not ask me again."
 msgstr "�l� kysy t�t� en�� uudelleen"
 
-#: mail/mail-callbacks.c:1976
+#: mail/mail-callbacks.c:1985
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:1986
+#: mail/mail-callbacks.c:1995
 msgid "Filters"
 msgstr "Suodattimet"
 
-#: mail/mail-callbacks.c:2032
+#: mail/mail-callbacks.c:2041
 msgid "Print Message"
 msgstr "Tulosta viesti"
 
-#: mail/mail-callbacks.c:2078
+#: mail/mail-callbacks.c:2087
 msgid "Printing of message failed"
 msgstr "Viestin tulostus ep�onnistui"
 
-#: mail/mail-callbacks.c:2162
+#: mail/mail-callbacks.c:2171
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -8700,86 +8786,106 @@ msgstr ""
 msgid "Evolution Account Assistant"
 msgstr "Evolutionin tilimuokkain"
 
-#: mail/mail-config.c:1486
-#, fuzzy
-msgid "Evolution Shortcuts"
-msgstr "Evolutionin aseukseni"
+#: mail/mail-config.c:315
+#, fuzzy, c-format
+msgid "Account %d"
+msgstr "Tili"
 
-#. right now, the URL always works basically as a matter of luck...
-#. * both IMAP and mbox spool stores have INBOX as their inbox folder
-#. * name. I don't think this will work with maildir. How can we figure out
-#. * what shortcut to insert?
-#.
 #: mail/mail-config.c:1618
+#, c-format
+msgid ""
+"Could not get inbox for new mail store:\n"
+"%s\n"
+"No shortcut will be created."
+msgstr ""
+
+#. Create the shortcut. FIXME: This only works if the
+#. * full name matches the path.
+#.
+#: mail/mail-config.c:1629
 #, fuzzy, c-format
 msgid "%s: Inbox"
 msgstr "Saapuneet"
 
-#: mail/mail-config.c:1851
+#: mail/mail-config.c:1873
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:1922 mail/mail-config.c:1925
+#: mail/mail-config.c:1944 mail/mail-config.c:1947
 msgid "Connecting to server..."
 msgstr ""
 
 #: mail/mail-config.glade.h:1
+#, fuzzy
+msgid " _Check for supported types "
+msgstr "Tar_kista tuetut tavat"
+
+#: mail/mail-config.glade.h:2
 msgid " color"
 msgstr " "
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr "Tili"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr "Tilitiedot"
 
-#: mail/mail-config.glade.h:5 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:6 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Tilinhallinta"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "Accounts"
 msgstr "Tilit"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:10
 msgid "Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:10 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Liite"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:12
 msgid "Authentication"
 msgstr "Todennus"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:13
 msgid "Authentication Type: "
 msgstr "Todennustapa:"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:14
 msgid "Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:16
 msgid "Composer"
 msgstr "Muokkain"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:17
+#, fuzzy
+msgid "Configuration"
+msgstr "Palvelimen asetukset"
+
+#: mail/mail-config.glade.h:18
+msgid "Confirm when Expunging a folder"
+msgstr ""
+
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -8789,316 +8895,299 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr "_Oletukset"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:26
 msgid "Default Forward style is: "
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:27
 msgid "Default character encoding: "
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:29
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:30
 msgid "Display"
 msgstr ""
 
-#: mail/mail-config.glade.h:27 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:31 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Valmis"
 
-#: mail/mail-config.glade.h:28 shell/e-local-storage.c:174
+#: mail/mail-config.glade.h:32 shell/e-local-storage.c:174
 msgid "Drafts"
 msgstr "Luonnokset"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:33
 msgid "Drafts folder:"
 msgstr "Luonnoskansio:"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:34
 msgid "E_nable"
 msgstr "K�_yt�"
 
-#: mail/mail-config.glade.h:31
-#, fuzzy
-msgid "Each account must have a different name."
-msgstr "Tallenna tiedosto uudella nimell�"
-
-#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:96
 #: widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr "Muokkaa..."
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:36
 msgid "Enabled"
 msgstr "K�yt�"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:37
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:38
 msgid "HTML signature file:"
 msgstr "HTML-allekirjoitustiedosto:"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:39
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:40 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:41
 msgid "In HTML mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:42
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:43
 msgid "Kerberos "
 msgstr "Kerberos"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:44
 msgid "Mail Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:46
 msgid "Mailbox location"
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:47
 msgid "Make this my _default account"
 msgstr "Tee t�st� _oletustilini"
 
-#: mail/mail-config.glade.h:45
-msgid "Message _preview should be displayed by default"
-msgstr "Viestin _esikatselu on k�yt�ss� oletuksena"
-
-#: mail/mail-config.glade.h:46
-msgid "Message list should display in a _threaded fashion by default"
-msgstr ""
-
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 msgid "NNTP Server:"
 msgstr "NNTP-palvelin"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:49
 msgid "News"
 msgstr "Uutiset"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:51
 msgid "Optional Information"
 msgstr "Valinnaiset tiedot"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:53
 msgid "PGP Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 msgid "Pick a color"
 msgstr "Valitse v�ri"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 msgid "Prompt when sending messages with an _empty subject"
 msgstr ""
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:60
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:61
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Otetaan vastaan s�hk�postia"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:63
 msgid "Receiving Mail"
 msgstr "Tuleva posti"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:64
 msgid "Receiving Options"
 msgstr "Hakuasetukset"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:65
 msgid "Required Information"
 msgstr "Pakolliset tiedot"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:67
 msgid "Secure MIME"
 msgstr ""
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:68
 msgid "Security"
 msgstr "Turvallisuus"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:69
 msgid "Select Filter Log file..."
 msgstr ""
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:70
 msgid "Select PGP binary"
 msgstr "Valitse PGP-ohjelma"
 
-#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:71 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "L�hetet��n s�hk�postia"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:72
 msgid "Sending Mail"
 msgstr "L�htev� posti"
 
-#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:74 mail/message-list.etspec.h:6
 #: shell/e-local-storage.c:177
 msgid "Sent"
 msgstr "L�hetetyt"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:75
 msgid "Sent and Draft Messages"
 msgstr "L�hetetyt viestit ja luonnokset"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:76
 msgid "Sent messages folder:"
 msgstr "L�hetettyjen kansio:"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:77
 msgid "Server Configuration"
 msgstr "Palvelimen asetukset"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 msgid "Server Type: "
 msgstr "Palvelintyyppi: "
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 msgid "Server requires _authentication"
 msgstr "P_alvelin vaati todennuksen"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:80
 msgid "Signature file:"
 msgstr "Allekirjoitustiedosto:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "Source"
 msgstr "L�hde"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 msgid "Source Information"
 msgstr "L�hteen tiedot"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:83
 msgid "Sources"
 msgstr "L�hteet"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
 msgid "Special Folders"
 msgstr "Erikoiskansiot"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:85
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:87
 msgid "Use secure connection (_SSL)"
 msgstr "K�yt� salattua yhteytt� (_SSL)"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:88
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:92
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:93
 msgid "_Automatically check for new mail every"
 msgstr "T_arkasta onko uutta postia joka"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:94
 msgid "_Check for supported types"
 msgstr "Tar_kista tuetut tavat"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:97
 msgid "_Email Address:"
 msgstr "S�hk�postiosoit_e:"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:98
 msgid "_Empty trash folders on exit"
 msgstr "Tyhj_enn� roskakorit lopetettaessa"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 msgid "_Full Name:"
 msgstr "_Koko nimi:"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "_HTML Signature:"
 msgstr "_HTML-allekirjoitus:"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 msgid "_Highlight citations with"
 msgstr "_Korosta lainaukset v�rill�"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:102
 msgid "_Host:"
 msgstr "_Is�nt�palvelin:"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 msgid "_Log filter actions to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 msgid "_Mark messages as Read after"
 msgstr "_Merkitse viestit luetuiksi kun on kulunut"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "_Name:"
 msgstr "_Nimi:"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 msgid "_Organization:"
 msgstr "_Organisaatio:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:109
 msgid "_PGP binary path:"
 msgstr "_PGP-ohjelman polku:"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 msgid "_Path:"
 msgstr "_Polku:"
 
-#: mail/mail-config.glade.h:110
-msgid "_Remember PGP Passphrase until exit"
-msgstr ""
-
 #: mail/mail-config.glade.h:111
 msgid "_Remember this password"
 msgstr "_Muista t�m� salasana"
@@ -9132,39 +9221,39 @@ msgstr ""
 msgid "seconds."
 msgstr "sekuntia."
 
-#: mail/mail-crypto.c:60
+#: mail/mail-crypto.c:59
 msgid "Could not create a PGP signature context."
 msgstr ""
 
-#: mail/mail-crypto.c:86
+#: mail/mail-crypto.c:84
 msgid "Could not create a PGP verification context."
 msgstr ""
 
-#: mail/mail-crypto.c:116
+#: mail/mail-crypto.c:113
 msgid "Could not create a PGP encryption context."
 msgstr ""
 
-#: mail/mail-crypto.c:142
+#: mail/mail-crypto.c:138
 msgid "Could not create a PGP decryption context."
 msgstr ""
 
-#: mail/mail-crypto.c:177
+#: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
 msgstr ""
 
-#: mail/mail-crypto.c:209
+#: mail/mail-crypto.c:205
 msgid "Could not create a S/MIME certsonly context."
 msgstr ""
 
-#: mail/mail-crypto.c:240
+#: mail/mail-crypto.c:236
 msgid "Could not create a S/MIME encryption context."
 msgstr ""
 
-#: mail/mail-crypto.c:271
+#: mail/mail-crypto.c:267
 msgid "Could not create a S/MIME envelope context."
 msgstr ""
 
-#: mail/mail-crypto.c:301
+#: mail/mail-crypto.c:297
 msgid "Could not create a S/MIME decode context."
 msgstr ""
 
@@ -9210,11 +9299,11 @@ msgstr "Avaa linkki selaimessa"
 msgid "Copy Link Location"
 msgstr "Kopioi linkin sijainti"
 
-#: mail/mail-display.c:1519
+#: mail/mail-display.c:1520
 msgid "Save Link as (FIXME)"
 msgstr "Tallenna linkki nimell�"
 
-#: mail/mail-display.c:1521
+#: mail/mail-display.c:1523
 msgid "Save Image as..."
 msgstr "Tallenna kuva nimell�..."
 
@@ -9231,134 +9320,134 @@ msgstr ""
 msgid "Date"
 msgstr "P�iv�ys"
 
-#: mail/mail-format.c:860
+#: mail/mail-format.c:862
 msgid "Bad Address"
 msgstr "Ep�kelpo osoite"
 
-#: mail/mail-format.c:882 mail/message-list.etspec.h:3
+#: mail/mail-format.c:903 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "L�hett�j�"
 
-#: mail/mail-format.c:885
+#: mail/mail-format.c:906
 msgid "Reply-To"
 msgstr "Vastausosoite:"
 
-#: mail/mail-format.c:888 mail/message-list.etspec.h:10
+#: mail/mail-format.c:910 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Vastaanottaja"
 
-#: mail/mail-format.c:891
+#: mail/mail-format.c:914
 msgid "Cc"
 msgstr "Kopiot:"
 
-#: mail/mail-format.c:1311
+#: mail/mail-format.c:1357
 msgid "No GPG/PGP program configured."
 msgstr ""
 
-#: mail/mail-format.c:1327
+#: mail/mail-format.c:1373
 msgid "Encrypted message not displayed"
 msgstr "Salattua viesti� ei n�ytet�"
 
-#: mail/mail-format.c:1338
+#: mail/mail-format.c:1384
 msgid "Encrypted message"
 msgstr "Salattu viesti"
 
-#: mail/mail-format.c:1339
+#: mail/mail-format.c:1385
 msgid "Click icon to decrypt."
 msgstr "Napsauta kuvaketta salauksen purkamiseksi."
 
-#: mail/mail-format.c:1394
+#: mail/mail-format.c:1440
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1405
+#: mail/mail-format.c:1451
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2083
+#: mail/mail-format.c:2128
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2097
+#: mail/mail-format.c:2142
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2102
+#: mail/mail-format.c:2147
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2131
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2139
+#: mail/mail-format.c:2184
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2144
+#: mail/mail-format.c:2189
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:547
+#: mail/mail-local.c:563
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "Synkronoidaan kansiota"
 
-#: mail/mail-local.c:620
+#: mail/mail-local.c:636
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:676
+#: mail/mail-local.c:689
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: mail/mail-local.c:722
+#: mail/mail-local.c:735
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: mail/mail-local.c:1052
+#: mail/mail-local.c:1075
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1067
+#: mail/mail-local.c:1090
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1089
+#: mail/mail-local.c:1112
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1180
+#: mail/mail-local.c:1200
 msgid "You cannot change the format of a non-local folder."
 msgstr "Et voi muuttaa ei-paikallisen kansion tyyppi�."
 
-#: mail/mail-local.c:1190
-#, c-format
-msgid "Reconfigure %s"
-msgstr ""
+#: mail/mail-local.c:1209
+#, fuzzy, c-format
+msgid "Reconfigure /%s"
+msgstr "Synkronoidaan kansiota"
 
-#: mail/mail-mt.c:188
+#: mail/mail-mt.c:199
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:191
+#: mail/mail-mt.c:202
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -9366,21 +9455,25 @@ msgid ""
 msgstr ""
 
 #. Remember the password?
-#: mail/mail-mt.c:454
+#: mail/mail-mt.c:509
 msgid "Remember this password"
 msgstr "Muista t�m� salasana"
 
-#: mail/mail-mt.c:511
+#: mail/mail-mt.c:510
+msgid "Remember this password for the remainder of this session"
+msgstr ""
+
+#: mail/mail-mt.c:567
 #, c-format
 msgid "Enter Password for %s"
 msgstr ""
 
-#: mail/mail-mt.c:514
+#: mail/mail-mt.c:570
 #, fuzzy
 msgid "Enter Password"
 msgstr "Salasana"
 
-#: mail/mail-mt.c:824
+#: mail/mail-mt.c:886
 msgid "Working"
 msgstr ""
 
@@ -9529,6 +9622,11 @@ msgstr ""
 msgid "Disconnecting from %s"
 msgstr ""
 
+#: mail/mail-ops.c:2065
+#, fuzzy, c-format
+msgid "Reconnecting to %s"
+msgstr "Hakuasetukset"
+
 #: mail/mail-search-dialogue.c:113
 msgid "_Search"
 msgstr "_Etsi"
@@ -9584,12 +9682,12 @@ msgstr ""
 msgid "Type: %s"
 msgstr "Tyyppi:"
 
-#: mail/mail-send-recv.c:282
+#: mail/mail-send-recv.c:283
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "L�het� & Vastaanota postia"
 
-#: mail/mail-send-recv.c:283
+#: mail/mail-send-recv.c:284
 #, fuzzy
 msgid "Cancel All"
 msgstr "Peruuta"
@@ -9610,34 +9708,48 @@ msgstr "Peruutettu."
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-tools.c:173
+#: mail/mail-tools.c:133
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr ""
 
-#: mail/mail-tools.c:299
+#: mail/mail-tools.c:259
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "V�litetty viesti - %s"
 
-#: mail/mail-tools.c:303
+#: mail/mail-tools.c:263
 msgid "Forwarded message"
 msgstr "V�litetty viesti"
 
-#: mail/mail-tools.c:439
+#: mail/mail-tools.c:396
 msgid "Forwarded Message"
 msgstr "V�litetty viesti"
 
-#: mail/mail-vfolder.c:161
+#: mail/mail-vfolder.c:84
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Poistetaan kansiota %s"
 
-#: mail/mail-vfolder.c:435
+#: mail/mail-vfolder.c:201
+#, fuzzy, c-format
+msgid "Updating vfolders for uri: %s"
+msgstr "Poistetaan kansiota %s"
+
+#: mail/mail-vfolder.c:414
+#, c-format
+msgid ""
+"The following vFolder(s):\n"
+"%sUsed the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+
+#: mail/mail-vfolder.c:636
 msgid "VFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:541
+#: mail/mail-vfolder.c:742
 msgid "New VFolder"
 msgstr ""
 
@@ -9706,7 +9818,7 @@ msgstr "%a %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2331
+#: mail/message-list.c:2334
 msgid "Generating message list"
 msgstr "Luodaan viestiluetteloa"
 
@@ -9796,33 +9908,33 @@ msgstr "Poista tilaus"
 msgid "Evolution component for the executive summary."
 msgstr ""
 
-#: my-evolution/component-factory.c:30
+#: my-evolution/component-factory.c:45
 msgid "Folder containing the Evolution Summary"
 msgstr ""
 
-#: my-evolution/component-factory.c:139
+#: my-evolution/component-factory.c:154
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:248 my-evolution/e-summary-calendar.c:266
+#: my-evolution/e-summary-calendar.c:263 my-evolution/e-summary-calendar.c:281
 msgid "Appointments"
 msgstr "Tapaamiset"
 
-#: my-evolution/e-summary-calendar.c:249
+#: my-evolution/e-summary-calendar.c:264
 msgid "No appointments"
 msgstr "Ei tapaamisia"
 
-#: my-evolution/e-summary-calendar.c:286
+#: my-evolution/e-summary-calendar.c:301
 #, fuzzy
 msgid "%k%M %d %B"
 msgstr "%A %d %B"
 
-#: my-evolution/e-summary-calendar.c:288
+#: my-evolution/e-summary-calendar.c:303
 #, fuzzy
 msgid "%l:%M %d %B"
 msgstr "%A %d %B"
 
-#: my-evolution/e-summary-mail.c:115
+#: my-evolution/e-summary-mail.c:130
 msgid "Mail summary"
 msgstr "Postin yhteenveto"
 
@@ -9830,89 +9942,89 @@ msgstr "Postin yhteenveto"
 #. see in My Evolution by default. You can find the list of all
 #. stations and their codes in Evolution sources
 #. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-preferences.c:65
-#: my-evolution/e-summary-weather.c:615
+#: my-evolution/e-summary-preferences.c:80
+#: my-evolution/e-summary-weather.c:630
 msgid "KBOS:ZSAM:EGAA"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:427
+#: my-evolution/e-summary-preferences.c:441
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:449
+#: my-evolution/e-summary-preferences.c:463
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:890
+#: my-evolution/e-summary-preferences.c:929
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:898
+#: my-evolution/e-summary-preferences.c:937
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:902
+#: my-evolution/e-summary-preferences.c:941
 msgid "Name:"
 msgstr "Nimi:"
 
-#: my-evolution/e-summary-preferences.c:1438
+#: my-evolution/e-summary-preferences.c:1486
 #, fuzzy
 msgid "Summary Settings"
 msgstr "Yhteenveto sis�lt��"
 
-#: my-evolution/e-summary-rdf.c:277 my-evolution/e-summary-rdf.c:362
-#: my-evolution/e-summary-rdf.c:395
+#: my-evolution/e-summary-rdf.c:297 my-evolution/e-summary-rdf.c:382
+#: my-evolution/e-summary-rdf.c:415
 #, fuzzy
 msgid "Error downloading RDF"
 msgstr "<b>Virhe ladattaessa RDF:��</b>"
 
-#: my-evolution/e-summary-rdf.c:487
+#: my-evolution/e-summary-rdf.c:507
 #, fuzzy
 msgid "News Feed"
 msgstr "_Uusi kansio"
 
-#: my-evolution/e-summary-tasks.c:216
+#: my-evolution/e-summary-tasks.c:238
 msgid "No tasks"
 msgstr "Ei teht�vi�"
 
-#: my-evolution/e-summary-tasks.c:255
+#: my-evolution/e-summary-tasks.c:277
 #, fuzzy
 msgid "(No Description)"
 msgstr "Kuvaus:"
 
-#: my-evolution/e-summary-weather.c:57
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr "S��tiedot"
 
-#: my-evolution/e-summary-weather.c:334
+#: my-evolution/e-summary-weather.c:349
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr "<dd><b>S��tietopalvelimeen ei saatu yhteytt�</b></dd>"
 
-#: my-evolution/e-summary-weather.c:524
+#: my-evolution/e-summary-weather.c:539
 #, fuzzy
 msgid "Weather"
 msgstr "S��tiedot"
 
-#: my-evolution/e-summary-weather.c:676
+#: my-evolution/e-summary-weather.c:691
 msgid "Regions"
 msgstr "Alueet"
 
-#: my-evolution/e-summary.c:162
+#: my-evolution/e-summary.c:187
 #, fuzzy
 msgid "%A, %B %e %Y"
 msgstr "%A, %B %d, %Y"
 
-#: my-evolution/e-summary.c:512 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:568 ui/my-evolution.xml.h:3
 #, fuzzy
 msgid "Print Summary"
 msgstr "Kuvaus"
 
-#: my-evolution/e-summary.c:558
+#: my-evolution/e-summary.c:614
 #, fuzzy
 msgid "Printing of Summary failed"
 msgstr "Viestin tulostus ep�onnistui"
 
-#: my-evolution/main.c:52
+#: my-evolution/main.c:67
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr ""
 
@@ -11322,70 +11434,70 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:174
+#: shell/e-shell-folder-commands.c:176
 msgid "Cannot move a folder over itself."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:178
 msgid "Cannot copy a folder over itself."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:190
+#: shell/e-shell-folder-commands.c:192
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:294
+#: shell/e-shell-folder-commands.c:312
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:299
+#: shell/e-shell-folder-commands.c:317
 msgid "Copy folder"
 msgstr "Kopioi kansio"
 
-#: shell/e-shell-folder-commands.c:337
+#: shell/e-shell-folder-commands.c:359
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:342
+#: shell/e-shell-folder-commands.c:364
 msgid "Move folder"
 msgstr "Siir� kansio"
 
-#: shell/e-shell-folder-commands.c:367
+#: shell/e-shell-folder-commands.c:390
 #, fuzzy, c-format
 msgid ""
 "Cannot delete folder:\n"
 "%s"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: shell/e-shell-folder-commands.c:383
-#, c-format
-msgid "Delete folder '%s'"
-msgstr "Poista kansio '%s'"
+#: shell/e-shell-folder-commands.c:406
+#, fuzzy, c-format
+msgid "Delete \"%s\""
+msgstr "Poista"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:393
-#, c-format
-msgid "Are you sure you want to remove the '%s' folder?"
+#: shell/e-shell-folder-commands.c:416
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the \"%s\" folder?"
 msgstr "Haluatko todella poistaa kansion '%s'?"
 
-#. Popup a dialog asking what the user would like to rename
-#. the folder to
-#: shell/e-shell-folder-commands.c:468
-#, c-format
-msgid "Rename folder '%s'"
-msgstr "Nime� kansio '%s' uudelleen"
+#: shell/e-shell-folder-commands.c:470
+#, fuzzy, c-format
+msgid ""
+"Cannot rename folder:\n"
+"%s"
+msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: shell/e-shell-folder-commands.c:472
-msgid "Rename"
-msgstr "Nime� uudelleen"
+#: shell/e-shell-folder-commands.c:503
+#, fuzzy, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "Nime� kansio '%s' uudelleen"
 
-#. Make, pack the label
-#: shell/e-shell-folder-commands.c:480
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "Kansion nimi:"
+#: shell/e-shell-folder-commands.c:506
+#, fuzzy
+msgid "Rename folder"
+msgstr "Nime� kansio '%s' uudelleen"
 
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
@@ -11421,13 +11533,13 @@ msgstr ""
 msgid "Evolution - Create new folder"
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:99
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:348
+#: shell/e-shell-folder-selection-dialog.c:360
 msgid "New..."
 msgstr "Uusi..."
 
@@ -11435,7 +11547,11 @@ msgstr "Uusi..."
 msgid "(Untitled)"
 msgstr "(Nimet�n)"
 
-#: shell/e-shell-importer.c:102
+#: shell/e-shell-importer.c:141
+msgid "Choose the type of importer to run"
+msgstr ""
+
+#: shell/e-shell-importer.c:144
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -11444,9 +11560,13 @@ msgid ""
 "to work it out."
 msgstr ""
 
+#: shell/e-shell-importer.c:150
+msgid "Please select the information that you would like to import"
+msgstr ""
+
 #. Importer isn't ready yet.
 #. Wait 5 seconds and try again.
-#: shell/e-shell-importer.c:197
+#: shell/e-shell-importer.c:242
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11454,82 +11574,105 @@ msgid ""
 "Waiting 5 seconds to retry."
 msgstr ""
 
-#: shell/e-shell-importer.c:217 shell/e-shell-importer.c:248
+#: shell/e-shell-importer.c:262 shell/e-shell-importer.c:293
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:351
+#: shell/e-shell-importer.c:396
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "Kansiota `%s' ei ole olemassa."
 
-#: shell/e-shell-importer.c:363
+#: shell/e-shell-importer.c:408
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:378
+#: shell/e-shell-importer.c:423
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-importer.c:388
+#: shell/e-shell-importer.c:433
 msgid "Importing"
 msgstr ""
 
-#: shell/e-shell-importer.c:396
+#: shell/e-shell-importer.c:441
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:454
 #, c-format
 msgid "Error starting %s"
 msgstr "Virhe %s:n k�ynnistyksess�"
 
-#: shell/e-shell-importer.c:428
+#: shell/e-shell-importer.c:473
 #, c-format
 msgid "Error loading %s"
 msgstr "Virhe %s:n lataamisessa"
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:490
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:560
 msgid "Automatic"
 msgstr ""
 
-#: shell/e-shell-importer.c:566
+#: shell/e-shell-importer.c:611
 msgid "Filename:"
 msgstr "Tiedostonimi:"
 
-#: shell/e-shell-importer.c:571
+#: shell/e-shell-importer.c:616
 msgid "Select a file"
 msgstr "Valitse tiedosto"
 
-#: shell/e-shell-importer.c:581
+#: shell/e-shell-importer.c:626
 msgid "File type:"
 msgstr "Tiedoston tyyppi:"
 
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:651
+msgid "Import data and settings from older programs"
+msgstr ""
+
+#: shell/e-shell-importer.c:655
+msgid "Import a single file"
+msgstr ""
+
+#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:582
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:585
+msgid "Starting Intelligent Importers"
+msgstr ""
+
+#: shell/e-shell-importer.c:840 shell/e-shell-startup-wizard.c:703
+#, fuzzy, c-format
+msgid "From %s:"
+msgstr "L�hett�j�:"
+
+#: shell/e-shell-importer.c:1003
 msgid "Select folder"
 msgstr "Valitse kansio"
 
-#: shell/e-shell-importer.c:646
+#: shell/e-shell-importer.c:1004
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:689 shell/importer/intelligent.c:194
+#: shell/e-shell-importer.c:1116 shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "Tuo"
 
@@ -11549,72 +11692,66 @@ msgstr ""
 msgid "Cannot initialize the Evolution Mailer Wizard interface"
 msgstr "Evolutionin s�hk�postikomponentin alustus ep�onnistui."
 
-#: shell/e-shell-startup-wizard.c:582
-msgid ""
-"Please wait...\n"
-"Scanning for existing setups"
-msgstr ""
-
-#: shell/e-shell-startup-wizard.c:585
-msgid "Starting Intelligent Importers"
-msgstr ""
-
-#: shell/e-shell-startup-wizard.c:703
-#, fuzzy, c-format
-msgid "From %s:"
-msgstr "L�hett�j�:"
-
 #: shell/e-shell-startup-wizard.c:745
 msgid ""
 "Please select the information\n"
 "that you would like to import"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:183
+#: shell/e-shell-view-menu.c:201
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug budday ei l�ytynyt $PATH:istasi."
 
-#: shell/e-shell-view-menu.c:191
+#: shell/e-shell-view-menu.c:209
 msgid "Bug buddy could not be run."
 msgstr "Bug buddya ei voitu ajaa."
 
-#: shell/e-shell-view-menu.c:217
+#: shell/e-shell-view-menu.c:235
 #, fuzzy
 msgid "Ximian Evolution"
 msgstr "Evolution"
 
-#: shell/e-shell-view-menu.c:219
+#: shell/e-shell-view-menu.c:237
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:221
+#: shell/e-shell-view-menu.c:239
 msgid ""
 "Ximian Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
 "within the GNOME desktop environment."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:424
+#: shell/e-shell-view-menu.c:442
 msgid "Go to folder..."
 msgstr "Siirry kansioon..."
 
-#: shell/e-shell-view-menu.c:425
+#: shell/e-shell-view-menu.c:443
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:570
+#: shell/e-shell-view-menu.c:563
 msgid "Create a new shortcut"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:571
+#: shell/e-shell-view-menu.c:564
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:685
+#: shell/e-shell-view-menu.c:595
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:603
+#, fuzzy, c-format
+msgid "Error executing %s."
+msgstr "Virhe suoritettaessa suodatinta: %s: %s"
+
+#: shell/e-shell-view-menu.c:705
 msgid "Work Online"
 msgstr "Ty�skentele linjoilla"
 
-#: shell/e-shell-view-menu.c:698 shell/e-shell-view-menu.c:711
+#: shell/e-shell-view-menu.c:718 shell/e-shell-view-menu.c:731
 #: ui/evolution.xml.h:30
 msgid "Work Offline"
 msgstr "Ty�skentele poissa linjoilta"
@@ -11623,69 +11760,69 @@ msgstr "Ty�skentele poissa linjoilta"
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:1478
+#: shell/e-shell-view.c:1512
 #, c-format
 msgid "%s (%d)"
 msgstr ""
 
-#: shell/e-shell-view.c:1480
+#: shell/e-shell-view.c:1514
 #, fuzzy
 msgid "(None)"
 msgstr "(Ei nime�)"
 
-#: shell/e-shell-view.c:1485
+#: shell/e-shell-view.c:1519
 #, fuzzy, c-format
 msgid "%s - Ximian Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1487
+#: shell/e-shell-view.c:1521
 #, fuzzy, c-format
 msgid "%s - Ximian Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell-view.c:1527
+#: shell/e-shell-view.c:1561
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1534
+#: shell/e-shell-view.c:1568
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1540
+#: shell/e-shell-view.c:1574
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:560
+#: shell/e-shell.c:562
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1496
+#: shell/e-shell.c:1488
 #, c-format
 msgid ""
 "Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
 "This probably means that the %s component has crashed."
 msgstr ""
 
-#: shell/e-shell.c:1700 widgets/misc/e-cell-date-edit.c:248
+#: shell/e-shell.c:1692 widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "OK"
 
-#: shell/e-shell.c:1702
+#: shell/e-shell.c:1694
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:1704
+#: shell/e-shell.c:1696
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:1706
+#: shell/e-shell.c:1698
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:1708 shell/e-storage.c:491
+#: shell/e-shell.c:1700 shell/e-storage.c:496
 msgid "Generic error"
 msgstr "Yleinen virhe"
 
@@ -11810,51 +11947,58 @@ msgstr "Virhe tallennettaessa oikoteit�."
 msgid "Shortcuts"
 msgstr "Oikotiet"
 
+#: shell/e-storage-set-view.c:645
+#, fuzzy, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr "Kansion hakeminen ei onnistu: %s: %s"
+
 #: shell/e-storage.c:182 shell/e-storage.c:188
 msgid "(No name)"
 msgstr "(Ei nime�)"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:494
 msgid "No error"
 msgstr "Ei virhett�"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:498
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:500
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:502
 msgid "I/O error"
 msgstr "I/O-virhe"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:504
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:506
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:503
+#: shell/e-storage.c:508
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:512
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:514
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:516
 msgid "The specified folder cannot be modified or removed"
 msgstr ""
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:518
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
@@ -11884,6 +12028,10 @@ msgstr "Is�nt�palvelin"
 msgid "The following connections are currently active:"
 msgstr ""
 
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr "Kansion nimi:"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder type:"
 msgstr "Kansion tyyppi:"
@@ -11938,15 +12086,25 @@ msgid "Evolution Importer Assistant"
 msgstr "Evolutionin asennus"
 
 #: shell/importer/import.glade.h:4
-msgid "Import File (Step 2 of 2)"
-msgstr ""
+#, fuzzy
+msgid "Import File (step 3 of 3)"
+msgstr "Valitse tiedosto"
 
 #: shell/importer/import.glade.h:5
+msgid "Importer Type (step 1 of 3)"
+msgstr ""
+
+#: shell/importer/import.glade.h:6
 #, fuzzy
-msgid "Select a File (step 1 of 2)"
+msgid "Select Importers (step 2 of 3)"
 msgstr "Valitse tiedosto"
 
-#: shell/importer/import.glade.h:6
+#: shell/importer/import.glade.h:7
+#, fuzzy
+msgid "Select a File (step 2 of 3)"
+msgstr "Valitse tiedosto"
+
+#: shell/importer/import.glade.h:8
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of\n"
@@ -12153,13 +12311,6 @@ msgstr "_Etsi kontakteja"
 msgid "_Select All"
 msgstr "Valitse k_aikki"
 
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:44
-#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
-#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:19
-#: ui/my-evolution.xml.h:9
-msgid "_Tools"
-msgstr "T_y�kalut"
-
 #: ui/evolution-calendar.xml.h:2
 msgid "Configure the calendar's settings"
 msgstr ""
@@ -12346,8 +12497,8 @@ 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:49
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:36
 msgid "_File"
 msgstr "_Tiedosto"
@@ -12368,8 +12519,8 @@ msgstr "Tallenna kontakti ja sulje ikkuna"
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:54
-#: ui/evolution-signature-editor.xml.h:11
+#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Save"
 msgstr "_Tallenna"
 
@@ -12962,6 +13113,11 @@ msgstr ""
 msgid "_Open Message"
 msgstr "_Avaa viesti"
 
+#: ui/evolution-mail-message.xml.h:98 ui/evolution.xml.h:49
+#: ui/my-evolution.xml.h:9
+msgid "_Tools"
+msgstr "T_y�kalut"
+
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Sulje t�m� ikkuna"
@@ -12973,8 +13129,8 @@ msgstr "Sulje t�m� ikkuna"
 msgid "_Close"
 msgstr "_Sulje"
 
-#: ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:48
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:50
 msgid "_View"
 msgstr "_N�yt�"
 
@@ -13136,36 +13292,31 @@ msgid "_Cc Field"
 msgstr "_Kopio-kentt�"
 
 #: ui/evolution-message-composer.xml.h:46
-#: ui/evolution-signature-editor.xml.h:6
-msgid "_Debug"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:47
 msgid "_Delete all"
 msgstr "_Poista kaikki"
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:49
 msgid "_From Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:51
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-signature-editor.xml.h:9
 msgid "_Insert"
 msgstr "Li_s��"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:51
 msgid "_Open..."
 msgstr "_Avaa..."
 
-#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Reply-To Field"
 msgstr "_Vastausosoite-kentt�"
 
-#: ui/evolution-message-composer.xml.h:55
+#: ui/evolution-message-composer.xml.h:54
 msgid "_Security"
 msgstr "Turvalli_suus"
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "_Ohje"
 
@@ -13301,7 +13452,7 @@ msgid "Exit the program"
 msgstr "Poistu ohjelmasta"
 
 #: ui/evolution.xml.h:15
-msgid "Import an external file format"
+msgid "Import data from other programs"
 msgstr ""
 
 #: ui/evolution.xml.h:17
@@ -13376,7 +13527,7 @@ msgstr "_Siirry kansioon..."
 
 #: ui/evolution.xml.h:41
 #, fuzzy
-msgid "_Import File..."
+msgid "_Import..."
 msgstr "_Siirry kansioon..."
 
 #: ui/evolution.xml.h:42
@@ -13392,18 +13543,23 @@ msgid "_New Folder"
 msgstr "_Uusi kansio"
 
 #: ui/evolution.xml.h:45
+#, fuzzy
+msgid "_Pilot Settings..."
+msgstr "_S�hk�postiasetukset..."
+
+#: ui/evolution.xml.h:46
 msgid "_Rename..."
 msgstr "_Nime� uudelleen..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:47
 msgid "_Shortcut"
 msgstr "_Oikotie"
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:48
 msgid "_Shortcut Bar"
 msgstr "_Oikotiepalkki"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:51
 msgid "_Work Offline"
 msgstr ""
 
@@ -13506,11 +13662,11 @@ msgstr "MTKTPLS"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:433
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:439
 msgid "Now"
 msgstr "Nyt"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:445
 msgid "Today"
 msgstr "T�n��n"
 
@@ -13655,21 +13811,59 @@ msgstr ""
 msgid "The Personal Calendar Server; calendar factory"
 msgstr ""
 
-#: wombat/wombat.c:175
+#: wombat/wombat.c:176
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): GNOME-VFS:n alustus ep�onnistui"
 
-#: wombat/wombat.c:187
+#: wombat/wombat.c:188
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): GNOME:n alustus ep�onnistui"
 
-#: wombat/wombat.c:200
+#: wombat/wombat.c:201
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobon alustus ep�onnistui"
 
 #, fuzzy
-#~ msgid "Cannot open folder: %s: No such folder"
-#~ msgstr "Kansion hakeminen ei onnistu: %s: %s"
+#~ msgid "_Calendar Information:"
+#~ msgstr "Tiedoksi"
+
+#~ msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
+#~ msgstr ""
+#~ "Prioriteetin tulee olla 'Korkea', 'Tavallinen', 'Matala' tai "
+#~ "'M��rittelem�t�n'."
+
+#, fuzzy
+#~ msgid "before start of appointment"
+#~ msgstr "Luo uusi tapaaminen"
+
+#, fuzzy
+#~ msgid "after start of appointment"
+#~ msgstr "Luo uusi tapaaminen"
+
+#, fuzzy
+#~ msgid "before end of appointment"
+#~ msgstr "Muistuta minua kaikista tapaamisista"
+
+#, fuzzy
+#~ msgid "Evolution Shortcuts"
+#~ msgstr "Evolutionin aseukseni"
+
+#, fuzzy
+#~ msgid "Each account must have a different name."
+#~ msgstr "Tallenna tiedosto uudella nimell�"
+
+#~ msgid "Message _preview should be displayed by default"
+#~ msgstr "Viestin _esikatselu on k�yt�ss� oletuksena"
+
+#~ msgid "Delete folder '%s'"
+#~ msgstr "Poista kansio '%s'"
+
+#~ msgid "Rename"
+#~ msgstr "Nime� uudelleen"
+
+#, fuzzy
+#~ msgid "_Import File..."
+#~ msgstr "_Siirry kansioon..."
 
 #~ msgid "123"
 #~ msgstr "123"
diff --git a/po/fr.po b/po/fr.po
index 615f720c90..86ee4783ea 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.14.99\n"
-"POT-Creation-Date: 2001-09-24 13:28+0200\n"
+"POT-Creation-Date: 2001-10-01 19:06-0400\n"
 "PO-Revision-Date: 2001-09-24 13:24+0200\n"
 "Last-Translator: Jean-No�l Guiheneuf <jean-noel.guiheneuf@wanadoo.fr>\n"
 "Language-Team: GNOME French Team <gnomefr@gnomefr.traduc.org>\n"
@@ -150,7 +150,7 @@ msgstr "RNIS"
 #: addressbook/backend/ebook/e-card-simple.c:83
 #: addressbook/gui/contact-editor/e-contact-editor.c:1606
 #: addressbook/gui/contact-editor/e-contact-editor.c:1664
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:52
 msgid "Other"
 msgstr "Autre"
 
@@ -616,10 +616,10 @@ msgstr "VCard pour %s"
 #: 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:1119
+#: addressbook/conduit/address-conduit.c:1167
 #: addressbook/gui/component/addressbook-factory.c:48
-#: calendar/conduits/calendar/calendar-conduit.c:1204
-#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/conduits/calendar/calendar-conduit.c:1262
+#: calendar/conduits/todo/todo-conduit.c:1034
 #: calendar/gui/alarm-notify/notify-main.c:78 calendar/gui/main.c:63
 msgid "Could not initialize Bonobo"
 msgstr "Ne peut initialiser Bonobo"
@@ -691,20 +691,20 @@ msgstr "Le curseur ne peut �tre charg�\n"
 msgid "EBook not loaded\n"
 msgstr "EBook non charg�\n"
 
-#: addressbook/conduit/address-conduit.c:681
-#: calendar/conduits/calendar/calendar-conduit.c:778
-#: calendar/conduits/todo/todo-conduit.c:592
+#: addressbook/conduit/address-conduit.c:731
+#: calendar/conduits/calendar/calendar-conduit.c:837
+#: calendar/conduits/todo/todo-conduit.c:609
 msgid "Could not start wombat server"
 msgstr "Ne peut d�marrer le serveur wombat"
 
-#: addressbook/conduit/address-conduit.c:682
-#: calendar/conduits/calendar/calendar-conduit.c:779
-#: calendar/conduits/todo/todo-conduit.c:593
+#: addressbook/conduit/address-conduit.c:732
+#: calendar/conduits/calendar/calendar-conduit.c:838
+#: calendar/conduits/todo/todo-conduit.c:610
 msgid "Could not start wombat"
 msgstr "Ne peut d�marrer wombat"
 
-#: addressbook/conduit/address-conduit.c:714
-#: addressbook/conduit/address-conduit.c:717
+#: addressbook/conduit/address-conduit.c:762
+#: addressbook/conduit/address-conduit.c:765
 #, fuzzy
 msgid "Could not read pilot's Address application block"
 msgstr "Ne peut lire le bloc d'application Adresse du Pilot"
@@ -753,8 +753,9 @@ msgid "Factory for the sample Addressbook control"
 msgstr "Utilitaire de contr�le du carnet d'adresses de base"
 
 #: addressbook/gui/component/addressbook-component.c:66
-#: calendar/gui/dialogs/comp-editor-util.c:281
-#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-shortcuts.c:1062
+#: calendar/gui/dialogs/comp-editor-util.c:289
+#: calendar/gui/dialogs/comp-editor-util.c:345 shell/e-local-storage.c:173
+#: shell/e-shortcuts.c:1062
 msgid "Contacts"
 msgstr "Contacts"
 
@@ -771,20 +772,20 @@ msgstr "Serveur LDAP"
 msgid "LDAP server containing contact information"
 msgstr "Dossier contenant les informations de contact"
 
-#: addressbook/gui/component/addressbook-component.c:386
+#: addressbook/gui/component/addressbook-component.c:411
 #: ui/evolution-addressbook.xml.h:11
 msgid "New Contact"
 msgstr "Nouveau contact"
 
-#: addressbook/gui/component/addressbook-component.c:386
+#: addressbook/gui/component/addressbook-component.c:411
 msgid "New _Contact"
 msgstr "Nouveau contact"
 
-#: addressbook/gui/component/addressbook-component.c:387
+#: addressbook/gui/component/addressbook-component.c:412
 msgid "New Contact List"
 msgstr "Nouvelle liste de contacts"
 
-#: addressbook/gui/component/addressbook-component.c:387
+#: addressbook/gui/component/addressbook-component.c:412
 msgid "New Contact _List"
 msgstr "Nouvelle liste de contacts"
 
@@ -894,19 +895,19 @@ msgid "_Account name:"
 msgstr "Nom de Compte"
 
 #: addressbook/gui/component/addressbook-config.glade.h:22
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: 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:90 my-evolution/my-evolution.glade.h:20
+#: mail/mail-config.glade.h:91 my-evolution/my-evolution.glade.h:20
 msgid "_Add"
 msgstr "_Ajouter"
 
 #: addressbook/gui/component/addressbook-config.glade.h:23
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:95
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:96
 #: ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
 #: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
 msgstr "_�diter"
@@ -923,6 +924,10 @@ msgstr "Port :"
 msgid "_Server name:"
 msgstr "Nom du serveur :"
 
+#: addressbook/gui/component/addressbook-storage.c:163
+msgid "Other Contacts"
+msgstr "Autres contacts"
+
 #: addressbook/gui/component/addressbook.c:407
 #, c-format
 msgid "Please enter your email address and password for access to %s"
@@ -1017,7 +1022,7 @@ msgid "(none)"
 msgstr "(Inconnu)"
 
 #: addressbook/gui/component/e-address-popup.c:466
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #: addressbook/gui/contact-editor/e-contact-editor.c:1636
 msgid "Primary Email"
 msgstr "E-mail principal"
@@ -1187,123 +1192,137 @@ msgid "Details"
 msgstr "D�tails"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#, fuzzy
+msgid "F_ree/Busy URL:"
+msgstr "URL Libre-Occup�"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "File A_s:"
 msgstr "C_lasser comme :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "General"
 msgstr "G�n�ral"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+msgid ""
+"If this person publishes free/busy or other calendar information on the "
+"Internet, enter the address\n"
+"of that information here."
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "New phone type"
 msgstr "Nouveau type de t�l�phone"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "No_tes:"
 msgstr "No_tes :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Organi_zation:"
 msgstr "_Organisation :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "Phone Types"
 msgstr "Types de t�l�phones"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "Wants to receive _HTML mail"
 msgstr "Veut recevoir des messages _HTML"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Address..."
 msgstr "Adre_sse..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "_Assistant's name:"
 msgstr "Nom de l'A_djoint :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Birthday:"
 msgstr "_Date de naissance :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Business"
 msgstr "Travail"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#, fuzzy
-msgid "_Calendar Information:"
-msgstr "Information calendrier"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 #: calendar/gui/dialogs/event-page.glade.h:12
 #: calendar/gui/dialogs/task-page.glade.h:10
 msgid "_Contacts..."
 msgstr "_Contacts..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:834 filter/filter.glade.h:8
-#: mail/folder-browser.c:1371 mail/mail-config.glade.h:94
+#: mail/folder-browser.c:1406 mail/mail-config.glade.h:95
 #: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "_Supprimer"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Department:"
 msgstr "_Service :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#, fuzzy
-msgid "_Free/Busy Information:"
-msgstr "Information Libre-Occup�"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Full Name..."
 msgstr "_Nom complet..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Home"
 msgstr "Maison"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Job title:"
 msgstr "Fonct_ion :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Manager's Name:"
 msgstr "Nom du _directeur :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Mobile"
 msgstr "Mobile"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Nickname:"
 msgstr "Sur_nom :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Office:"
 msgstr "_Bureau :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Profession:"
 msgstr "_Profession :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#, fuzzy
+msgid "_Public Calendar URL:"
+msgstr "Calendrier"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Spouse:"
 msgstr "_Conjoint(e) :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_This is the mailing address"
 msgstr "Adresse de la liste de diffusion"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Web page address:"
 msgstr "Adresse page _Web :"
 
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+#, fuzzy
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr "�tes-vous s�r de vouloir supprimer ce compte ?"
+
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 msgid "Delete Contact?"
 msgstr "Supprimer le contact ?"
 
@@ -2531,8 +2550,8 @@ msgid "Success"
 msgstr "Succ�s"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1710
-#: shell/e-storage.c:515
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1702
+#: shell/e-storage.c:520
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
@@ -2540,7 +2559,7 @@ msgstr "Erreur inconnue"
 msgid "Repository offline"
 msgstr "Repository Hors ligne"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:505
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:510
 msgid "Permission denied"
 msgstr "Permission refus�e"
 
@@ -2557,10 +2576,10 @@ msgid "Protocol not supported"
 msgstr "Protocole non support�"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:733 calendar/gui/calendar-model.c:1274
+#: calendar/gui/calendar-model.c:726 calendar/gui/calendar-model.c:1247
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:544
-#: camel/camel-service.c:580
+#: calendar/gui/e-calendar-table.c:461 camel/camel-service.c:598
+#: camel/camel-service.c:634
 msgid "Cancelled"
 msgstr "Annul�e"
 
@@ -2868,19 +2887,45 @@ msgstr "Imprimer la carte"
 msgid "Print envelope"
 msgstr "Imprimer l'enveloppe"
 
-#: calendar/conduits/calendar/calendar-conduit.c:735
-#: calendar/conduits/todo/todo-conduit.c:548
+#: calendar/cal-util/cal-util.c:418 calendar/cal-util/cal-util.c:440
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:385 mail/message-list.c:652
+msgid "High"
+msgstr "Haute"
+
+#: calendar/cal-util/cal-util.c:420 calendar/cal-util/cal-util.c:442
+#: calendar/gui/calendar-model.c:1673
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:386 mail/message-list.c:651
+msgid "Normal"
+msgstr "Normal"
+
+#: calendar/cal-util/cal-util.c:422 calendar/cal-util/cal-util.c:444
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:387 mail/message-list.c:650
+msgid "Low"
+msgstr "Basse"
+
+#. An empty string is the same as 'None'.
+#: calendar/cal-util/cal-util.c:438
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:388
+msgid "Undefined"
+msgstr "Ind�finie"
+
+#: calendar/conduits/calendar/calendar-conduit.c:793
+#: calendar/conduits/todo/todo-conduit.c:564
 msgid "Error while communicating with calendar server"
 msgstr "Erreur lors de la communication avec le serveur de calendrier"
 
-#: calendar/conduits/calendar/calendar-conduit.c:839
-#: calendar/conduits/calendar/calendar-conduit.c:842
+#: calendar/conduits/calendar/calendar-conduit.c:896
+#: calendar/conduits/calendar/calendar-conduit.c:899
 #, fuzzy
 msgid "Could not read pilot's Calendar application block"
 msgstr "Ne peut lire le bloc d'application Calendrier du Pilot"
 
-#: calendar/conduits/todo/todo-conduit.c:653
-#: calendar/conduits/todo/todo-conduit.c:656
+#: calendar/conduits/todo/todo-conduit.c:668
+#: calendar/conduits/todo/todo-conduit.c:671
 #, fuzzy
 msgid "Could not read pilot's ToDo application block"
 msgstr "Ne peut lire le bloc d'application � � faire � du Pilot"
@@ -2934,49 +2979,49 @@ msgstr "Service de notification d'alarme"
 msgid "Factory for the alarm notification service"
 msgstr "Utilitaire pour le service de notification d'alarme"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:152
 #, fuzzy, c-format
 msgid "Notification about your appointment starting on %s and ending on %s"
 msgstr ""
 "Notification � propos de votre rendez-vous commen�ant le %s et finissant le %"
 "s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:156
 #, fuzzy, c-format
 msgid "Notification about your appointment starting on %s"
 msgstr "Notification � propos de votre rendez-vous commen�ant le %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:161
 #, fuzzy, c-format
 msgid "Notification about your appointment ending on %s"
 msgstr "Notification � propos de votre rendez-vous finissant le %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:165
 msgid "Notification about your appointment"
 msgstr "Notification de votre rendez-vous"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:172
 #, fuzzy, c-format
 msgid "Notification about your task starting on %s and ending on %s"
 msgstr ""
 "Notification de votre t�che commen�ant le  %A %d %b %Y %H %M et finissant le "
 "%A %d %b %Y %H %M"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:176
 #, fuzzy, c-format
 msgid "Notification about your task starting on %s"
 msgstr "Notification de votre t�che commen�ant le %A %d %b %Y %H %M"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:181
 #, fuzzy, c-format
 msgid "Notification about your task ending on %s"
 msgstr "Notification de votre t�che finissant le %A %d %b %Y %H %M"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:185
 msgid "Notification about your task"
 msgstr "Notification de votre t�che"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:267
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "Alarme le %A %d %b %Y %H:%M"
 
@@ -3058,7 +3103,7 @@ msgstr "%A %d %B %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: calendar/gui/calendar-commands.c:467
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1442
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1446
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -3069,17 +3114,17 @@ msgstr ""
 "Ne peut cr�er la vue du calendrier. Veuillez v�rifier la configuration "
 "d'ORBit et d'OAF."
 
-#: calendar/gui/calendar-model.c:399 calendar/gui/calendar-model.c:1001
-#: calendar/gui/e-calendar-table.c:307
+#: calendar/gui/calendar-model.c:399 calendar/gui/calendar-model.c:994
+#: calendar/gui/e-calendar-table.c:364
 msgid "Private"
 msgstr "Priv�"
 
-#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:1003
-#: calendar/gui/e-calendar-table.c:308
+#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:996
+#: calendar/gui/e-calendar-table.c:365
 msgid "Confidential"
 msgstr "Confidentiel"
 
-#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:306
+#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:363
 msgid "Public"
 msgstr "_Public"
 
@@ -3099,67 +3144,48 @@ msgstr "E"
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:538 calendar/gui/calendar-model.c:1183
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:652
-msgid "High"
-msgstr "Haute"
-
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1185
-#: calendar/gui/calendar-model.c:1700
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:651
-msgid "Normal"
-msgstr "Normal"
-
-#: calendar/gui/calendar-model.c:542 calendar/gui/calendar-model.c:1187
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:650
-msgid "Low"
-msgstr "Basse"
-
-#: calendar/gui/calendar-model.c:573 calendar/gui/calendar-model.c:1220
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/calendar-model.c:566 calendar/gui/calendar-model.c:1193
+#: calendar/gui/e-calendar-table.c:437
 msgid "Free"
 msgstr "Libre"
 
-#: calendar/gui/calendar-model.c:575 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/calendar-model.c:568 calendar/gui/e-calendar-table.c:438
 #: calendar/gui/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr "Occup�"
 
-#: calendar/gui/calendar-model.c:724 calendar/gui/calendar-model.c:1268
+#: calendar/gui/calendar-model.c:717 calendar/gui/calendar-model.c:1241
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:401
+#: calendar/gui/e-calendar-table.c:458
 msgid "Not Started"
 msgstr "Non d�marr�e"
 
-#: calendar/gui/calendar-model.c:727 calendar/gui/calendar-model.c:1270
+#: calendar/gui/calendar-model.c:720 calendar/gui/calendar-model.c:1243
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:402
+#: calendar/gui/e-calendar-table.c:459
 msgid "In Progress"
 msgstr "En cours"
 
-#: calendar/gui/calendar-model.c:730 calendar/gui/calendar-model.c:1272
+#: calendar/gui/calendar-model.c:723 calendar/gui/calendar-model.c:1245
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-meeting-model.c:298
+#: calendar/gui/e-calendar-table.c:460 calendar/gui/e-meeting-model.c:298
 #: calendar/gui/e-meeting-model.c:321
 msgid "Completed"
 msgstr "Achev�e"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:915 e-util/e-time-utils.c:163
+#: calendar/gui/calendar-model.c:908 e-util/e-time-utils.c:163
 #: e-util/e-time-utils.c:354
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:918 e-util/e-time-utils.c:158
+#: calendar/gui/calendar-model.c:911 e-util/e-time-utils.c:158
 #: e-util/e-time-utils.c:363
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:923
+#: calendar/gui/calendar-model.c:916
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -3170,7 +3196,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:1087
+#: calendar/gui/calendar-model.c:1080
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3180,48 +3206,36 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1127
+#: calendar/gui/calendar-model.c:1120
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "La pourcentage doit �tre compris entre 0 et 100 inclus"
 
-#: calendar/gui/calendar-model.c:1168
-msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
-msgstr ""
-"La priorit� doit �tre � Haute �, � Normale �, � Basse � ou � Ind�finie �."
-
-#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1181
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:331
-msgid "Undefined"
-msgstr "Ind�finie"
-
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1266 calendar/gui/dialogs/meeting-page.c:332
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1444
+#: calendar/gui/calendar-model.c:1239 calendar/gui/dialogs/meeting-page.c:332
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1446
 #: mail/mail-accounts.c:143 mail/mail-accounts.c:390
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:50
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:203
-#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
-#: widgets/misc/e-dateedit.c:1428 widgets/misc/e-dateedit.c:1543
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:453
+#: widgets/misc/e-dateedit.c:1453 widgets/misc/e-dateedit.c:1568
 msgid "None"
 msgstr "Aucune"
 
-#: calendar/gui/calendar-model.c:1702
+#: calendar/gui/calendar-model.c:1675
 msgid "Recurring"
 msgstr "R�currant"
 
-#: calendar/gui/calendar-model.c:1704
+#: calendar/gui/calendar-model.c:1677
 msgid "Assigned"
 msgstr "Attribu�"
 
-#: calendar/gui/calendar-model.c:1710 calendar/gui/e-meeting-model.c:270
+#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:270
 #: calendar/gui/e-meeting-model.c:280 calendar/gui/e-meeting-model.c:506
 #: calendar/gui/e-meeting-model.c:702
 msgid "Yes"
 msgstr "Oui"
 
-#: calendar/gui/calendar-model.c:1710 calendar/gui/e-meeting-model.c:282
+#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:282
 #: calendar/gui/e-meeting-model.c:703
 msgid "No"
 msgstr "Non"
@@ -3254,43 +3268,44 @@ msgstr "La description contient"
 msgid "Comment contains"
 msgstr "Le commentaire contient"
 
-#: calendar/gui/cal-search-bar.c:416
+#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1054
 msgid "Unmatched"
 msgstr "Diff�rent"
 
-#: calendar/gui/component-factory.c:62 my-evolution/my-evolution.glade.h:6
-#: shell/e-shortcuts.c:1056
+#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:6
+#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1056
 msgid "Calendar"
 msgstr "Calendrier"
 
-#: calendar/gui/component-factory.c:63
+#: calendar/gui/component-factory.c:64
 msgid "Folder containing appointments and events"
 msgstr "Dossier contenant des rendez-vous et des �v�nements"
 
-#: calendar/gui/component-factory.c:67 my-evolution/e-summary-tasks.c:215
-#: my-evolution/e-summary-tasks.c:231 shell/e-shortcuts.c:1059
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1723
+#: my-evolution/e-summary-tasks.c:237 my-evolution/e-summary-tasks.c:253
+#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1059
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "T�ches"
 
-#: calendar/gui/component-factory.c:68
+#: calendar/gui/component-factory.c:69
 msgid "Folder containing to-do items"
 msgstr "Dossier contenant des �l�ments � � Faire �"
 
-#: calendar/gui/component-factory.c:593 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:581 ui/evolution-calendar.xml.h:7
 msgid "Create a new appointment"
 msgstr "Cr�e un nouveau rendez-vous"
 
-#: calendar/gui/component-factory.c:594 calendar/gui/e-day-view.c:3420
+#: calendar/gui/component-factory.c:582 calendar/gui/e-day-view.c:3422
 msgid "New _Appointment"
 msgstr "Nouveau _rendez-vous"
 
-#: calendar/gui/component-factory.c:599 ui/evolution-calendar.xml.h:8
+#: calendar/gui/component-factory.c:587 ui/evolution-calendar.xml.h:8
 #: ui/evolution-tasks.xml.h:5
 msgid "Create a new task"
 msgstr "Cr�e une nouvelle t�che"
 
-#: calendar/gui/component-factory.c:600
+#: calendar/gui/component-factory.c:588
 msgid "New _Task"
 msgstr "Nouvelle _t�che"
 
@@ -3364,95 +3379,120 @@ msgstr "heures"
 msgid "minutes"
 msgstr "minutes"
 
-#: calendar/gui/dialogs/alarm-page.c:303
+#: calendar/gui/dialogs/alarm-page.c:307
 #, c-format
 msgid "%d days"
 msgstr " %d jours"
 
-#: calendar/gui/dialogs/alarm-page.c:305
+#: calendar/gui/dialogs/alarm-page.c:310
 msgid "1 day"
 msgstr " 1 jour"
 
-#: calendar/gui/dialogs/alarm-page.c:308
+#: calendar/gui/dialogs/alarm-page.c:315
 #, c-format
 msgid "%d weeks"
 msgstr " %d semaines"
 
-#: calendar/gui/dialogs/alarm-page.c:310
+#: calendar/gui/dialogs/alarm-page.c:318
 msgid "1 week"
 msgstr " 1 semaine"
 
-#: calendar/gui/dialogs/alarm-page.c:313
+#: calendar/gui/dialogs/alarm-page.c:323
 #, c-format
 msgid "%d hours"
 msgstr " %d heures"
 
-#: calendar/gui/dialogs/alarm-page.c:315
+#: calendar/gui/dialogs/alarm-page.c:326
 msgid "1 hour"
 msgstr " 1 heure"
 
-#: calendar/gui/dialogs/alarm-page.c:318
+#: calendar/gui/dialogs/alarm-page.c:331
 #, c-format
 msgid "%d minutes"
 msgstr " %d minutes"
 
-#: calendar/gui/dialogs/alarm-page.c:320
+#: calendar/gui/dialogs/alarm-page.c:334
 msgid "1 minute"
 msgstr " 1 minute"
 
-#: calendar/gui/dialogs/alarm-page.c:323
+#: calendar/gui/dialogs/alarm-page.c:339
 #, c-format
 msgid "%d seconds"
 msgstr " %d secondes"
 
-#: calendar/gui/dialogs/alarm-page.c:325
+#: calendar/gui/dialogs/alarm-page.c:342
 msgid "1 second"
 msgstr " 1 seconde"
 
-#: calendar/gui/dialogs/alarm-page.c:350
+#: calendar/gui/dialogs/alarm-page.c:373
 #: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "Emettre un son"
 
-#: calendar/gui/dialogs/alarm-page.c:354
+#: calendar/gui/dialogs/alarm-page.c:377
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 msgid "Display a message"
 msgstr "Afficher un message"
 
-#: calendar/gui/dialogs/alarm-page.c:358
+#: calendar/gui/dialogs/alarm-page.c:381
 msgid "Send an email"
 msgstr "Envoyer un E-mail"
 
-#: calendar/gui/dialogs/alarm-page.c:362
+#: calendar/gui/dialogs/alarm-page.c:385
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "Lancer un programme"
 
-#: calendar/gui/dialogs/alarm-page.c:368 calendar/gui/dialogs/alarm-page.c:404
-#: calendar/gui/e-meeting-model.c:226 calendar/gui/e-meeting-model.c:261
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:674
-#: calendar/gui/e-meeting-model.c:690
-#: camel/providers/smtp/camel-smtp-transport.c:224
-#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
-msgid "Unknown"
-msgstr "Inconnu"
+#: calendar/gui/dialogs/alarm-page.c:391
+#, fuzzy
+msgid "Unknown action to be performed"
+msgstr "Orage inconnu"
+
+#: calendar/gui/dialogs/alarm-page.c:403
+#, fuzzy, c-format
+msgid "%s %s before the start of the appointment"
+msgstr "Avant le d�but du  rendez-vous"
+
+#: calendar/gui/dialogs/alarm-page.c:406
+#, fuzzy, c-format
+msgid "%s %s after the start of the appointment"
+msgstr "Avant le d�but du  rendez-vous"
 
-#: calendar/gui/dialogs/alarm-page.c:380
-msgid "before start of appointment"
+#: calendar/gui/dialogs/alarm-page.c:411
+#, fuzzy, c-format
+msgid "%s at the start of the appointment"
 msgstr "Avant le d�but du  rendez-vous"
 
-#: calendar/gui/dialogs/alarm-page.c:383
-msgid "after start of appointment"
-msgstr "Apr�s le d�but du rendez-vous"
+#: calendar/gui/dialogs/alarm-page.c:420
+#, fuzzy, c-format
+msgid "%s %s before the end of the appointment"
+msgstr "Avant le d�but du  rendez-vous"
 
-#: calendar/gui/dialogs/alarm-page.c:393
-msgid "before end of appointment"
-msgstr "Avant la fin du rendez-vous"
+#: calendar/gui/dialogs/alarm-page.c:423
+#, fuzzy, c-format
+msgid "%s %s after the end of the appointment"
+msgstr "Apr�s la fin du  rendez-vous"
 
-#: calendar/gui/dialogs/alarm-page.c:396
-msgid "after end of appointment"
+#: calendar/gui/dialogs/alarm-page.c:428
+#, fuzzy, c-format
+msgid "%s at the end of the appointment"
 msgstr "Apr�s la fin du  rendez-vous"
 
+#: calendar/gui/dialogs/alarm-page.c:439
+#, fuzzy, c-format
+msgid "%s at an unknown time"
+msgstr "Un exp�diteur inconnu"
+
+#: calendar/gui/dialogs/alarm-page.c:445
+#, fuzzy, c-format
+msgid "%s at %s"
+msgstr "%s serveur %s"
+
+#: calendar/gui/dialogs/alarm-page.c:452
+#, c-format
+msgid "%s for an unknown trigger type"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3771,55 +3811,55 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Vous n'avez fait aucune modification, Mettre � jour l'�diteur ?"
 
-#: calendar/gui/dialogs/comp-editor-util.c:159 calendar/gui/print.c:2128
+#: calendar/gui/dialogs/comp-editor-util.c:167 calendar/gui/print.c:2132
 msgid " to "
 msgstr " � "
 
-#: calendar/gui/dialogs/comp-editor-util.c:163 calendar/gui/print.c:2132
+#: calendar/gui/dialogs/comp-editor-util.c:171 calendar/gui/print.c:2136
 msgid " (Completed "
 msgstr " (Termin�"
 
-#: calendar/gui/dialogs/comp-editor-util.c:165 calendar/gui/print.c:2134
+#: calendar/gui/dialogs/comp-editor-util.c:173 calendar/gui/print.c:2138
 msgid "Completed "
 msgstr "Termin�"
 
-#: calendar/gui/dialogs/comp-editor-util.c:170 calendar/gui/print.c:2139
+#: calendar/gui/dialogs/comp-editor-util.c:178 calendar/gui/print.c:2143
 msgid " (Due "
 msgstr "(Date d'�ch�ance"
 
-#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2141
+#: calendar/gui/dialogs/comp-editor-util.c:180 calendar/gui/print.c:2145
 msgid "Due "
 msgstr "Date d'�ch�ance"
 
-#: calendar/gui/dialogs/comp-editor.c:515
+#: calendar/gui/dialogs/comp-editor.c:521
 msgid "Edit Appointment"
 msgstr "�diter le rendez-vous"
 
-#: calendar/gui/dialogs/comp-editor.c:520
+#: calendar/gui/dialogs/comp-editor.c:526
 #, c-format
 msgid "Appointment - %s"
 msgstr "Rendez-vous - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:523
+#: calendar/gui/dialogs/comp-editor.c:529
 #, c-format
 msgid "Task - %s"
 msgstr "T�che - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:526
+#: calendar/gui/dialogs/comp-editor.c:532
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entr�e de journal - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:540
+#: calendar/gui/dialogs/comp-editor.c:546
 msgid "No summary"
 msgstr "Aucun r�sum�"
 
-#: calendar/gui/dialogs/comp-editor.c:950 mail/mail-callbacks.c:1662
+#: calendar/gui/dialogs/comp-editor.c:952 mail/mail-callbacks.c:1671
 #: mail/mail-display.c:100
 msgid "Overwrite file?"
 msgstr "�craser le fichier ?"
 
-#: calendar/gui/dialogs/comp-editor.c:954 mail/mail-callbacks.c:1668
+#: calendar/gui/dialogs/comp-editor.c:956 mail/mail-callbacks.c:1677
 #: mail/mail-display.c:104
 msgid ""
 "A file by that name already exists.\n"
@@ -3828,53 +3868,53 @@ msgstr ""
 "Un fichier ayant le m�me nom existe.\n"
 "L'�craser ?"
 
-#: calendar/gui/dialogs/comp-editor.c:1017 ui/evolution-comp-editor.xml.h:13
+#: calendar/gui/dialogs/comp-editor.c:1019 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "Enregistrer sous..."
 
-#: calendar/gui/dialogs/comp-editor.c:1170
+#: calendar/gui/dialogs/comp-editor.c:1172
 msgid "Unable to obtain current version!"
 msgstr "Obtention de la version courante impossible !"
 
-#: calendar/gui/dialogs/delete-comp.c:90
+#: calendar/gui/dialogs/delete-comp.c:91
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "�tes-vous s�r de vouloir supprimer le rendez-vous � %s � ?"
 
-#: calendar/gui/dialogs/delete-comp.c:93
+#: calendar/gui/dialogs/delete-comp.c:94
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "�tes-vous s�r de vouloir supprimer ce rendez-vous sans titre ?"
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:100
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "�tes-vous s�r de vouloir supprimer la t�che � %s � ?"
 
-#: calendar/gui/dialogs/delete-comp.c:102
+#: calendar/gui/dialogs/delete-comp.c:103
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "�tes-vous s�r de vouloir supprimer cette t�che sans titre %s ?"
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:109
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "�tes-vous s�r de vouloir supprimer l'entr�e de journal � %s � ?"
 
-#: calendar/gui/dialogs/delete-comp.c:111
+#: calendar/gui/dialogs/delete-comp.c:112
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "�tes-vous s�r de vouloir supprimer cet entr�e de journal sans titre ?"
 
-#: calendar/gui/dialogs/delete-comp.c:126
+#: calendar/gui/dialogs/delete-comp.c:127
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "�tes-vous s�r de vouloir supprimer %d rendez-vous ?"
 
-#: calendar/gui/dialogs/delete-comp.c:131
+#: calendar/gui/dialogs/delete-comp.c:132
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "�tes-vous s�r de vouloir supprimer %d t�ches ?"
 
-#: calendar/gui/dialogs/delete-comp.c:136
+#: calendar/gui/dialogs/delete-comp.c:137
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "�tes-vous s�r de vouloir supprimer %d entr�es de journal ?"
@@ -3952,7 +3992,7 @@ msgid "Pu_blic"
 msgstr "Pu_blic"
 
 #: calendar/gui/dialogs/event-page.glade.h:10
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 #, fuzzy
 msgid "Show Time As"
 msgstr "Afficher l'heure comme"
@@ -4010,49 +4050,55 @@ msgstr "Pr�sents"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Common Name"
-msgstr "Nom Courant"
+#, fuzzy
+msgid "Click here to add an attendee"
+msgstr "* Cliquez ici pour ajouter un contact *"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
 #: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Delegated From"
-msgstr "D�l�gu� par"
+msgid "Common Name"
+msgstr "Nom Courant"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:4
 #: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated To"
-msgstr "D�l�gu� �"
+msgid "Delegated From"
+msgstr "D�l�gu� par"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:5
 #: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Language"
-msgstr "Langue"
+msgid "Delegated To"
+msgstr "D�l�gu� �"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:6
 #: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Member"
-msgstr "Membre"
+msgid "Language"
+msgstr "Langue"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
 #: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "RSVP"
-msgstr "R�ponse S.V.P"
+msgid "Member"
+msgstr "Membre"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "R�ponse S.V.P"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "R�le"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:9 filter/libfilter-i18n.h:49
+#: 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:49
 #: mail/message-list.etspec.h:8
 msgid "Status"
 msgstr "�tat"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/mail-config.glade.h:85
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:86
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Type"
@@ -4074,8 +4120,8 @@ msgstr "_Inviter d'autres personnes"
 msgid "_Other Organizer"
 msgstr "_Autre organizer"
 
-#: calendar/gui/dialogs/recurrence-page.c:422 calendar/gui/print.c:1851
-#: calendar/gui/print.c:1853 calendar/gui/print.c:1854
+#: calendar/gui/dialogs/recurrence-page.c:422 calendar/gui/print.c:1855
+#: calendar/gui/print.c:1857 calendar/gui/print.c:1858
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
@@ -4196,7 +4242,7 @@ msgid "Progress"
 msgstr "En cours"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:910
+#: my-evolution/e-summary-preferences.c:949
 msgid "URL:"
 msgstr "URL :"
 
@@ -4216,7 +4262,7 @@ msgstr "Attribu�"
 
 #: calendar/gui/dialogs/task-page.glade.h:4
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:28
 msgid "Description:"
 msgstr "Description :"
 
@@ -4232,105 +4278,106 @@ msgstr "Con_fidentiel"
 msgid "_Due Date:"
 msgstr "Date d'_�ch�ance :"
 
-#: calendar/gui/e-calendar-table.c:350
+#: calendar/gui/e-calendar-table.c:407
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:351
+#: calendar/gui/e-calendar-table.c:408
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:409
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:410
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:411
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:412
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:356
+#: calendar/gui/e-calendar-table.c:413
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:357
+#: calendar/gui/e-calendar-table.c:414
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:358
+#: calendar/gui/e-calendar-table.c:415
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:359
+#: calendar/gui/e-calendar-table.c:416
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:360
+#: calendar/gui/e-calendar-table.c:417
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3441
-#: calendar/gui/e-week-view.c:3288 mail/folder-browser.c:1336
+#: calendar/gui/e-calendar-table.c:914 calendar/gui/e-day-view.c:3443
+#: calendar/gui/e-week-view.c:3296 mail/folder-browser.c:1371
 #: shell/e-shortcuts-view.c:385
 msgid "_Open"
 msgstr "Ouvrir"
 
-#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3450
-#: calendar/gui/e-week-view.c:3297 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:918 calendar/gui/e-day-view.c:3452
+#: calendar/gui/e-week-view.c:3305 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:856 calendar/gui/e-day-view.c:3452
-#: calendar/gui/e-week-view.c:3299 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:920 calendar/gui/e-day-view.c:3454
+#: calendar/gui/e-week-view.c:3307 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:14
 msgid "_Copy"
 msgstr "_Copier"
 
-#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3427
-#: calendar/gui/e-day-view.c:3454 calendar/gui/e-week-view.c:3275
-#: calendar/gui/e-week-view.c:3301 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:922 calendar/gui/e-day-view.c:3429
+#: calendar/gui/e-day-view.c:3456 calendar/gui/e-week-view.c:3283
+#: calendar/gui/e-week-view.c:3309 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:40 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:17
 msgid "_Paste"
 msgstr "C_oller"
 
-#: calendar/gui/e-calendar-table.c:863
+#: calendar/gui/e-calendar-table.c:927
 msgid "_Mark as Complete"
 msgstr "Marquer comme termin�"
 
-#: calendar/gui/e-calendar-table.c:865
+#: calendar/gui/e-calendar-table.c:929
 msgid "_Delete this Task"
 msgstr "Supprimer cette t�che"
 
-#: calendar/gui/e-calendar-table.c:868
+#: calendar/gui/e-calendar-table.c:932
 msgid "_Mark Tasks as Complete"
 msgstr "Marquer les t�ches comme termin�es"
 
-#: calendar/gui/e-calendar-table.c:870
+#: calendar/gui/e-calendar-table.c:934
 msgid "_Delete Selected Tasks"
 msgstr "Supprimer les t�ches s�lectionn�es"
 
-#: calendar/gui/e-calendar-table.c:1130
+#: calendar/gui/e-calendar-table.c:1194
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Cliquez ici pour ajouter une t�che"
 
@@ -4338,48 +4385,48 @@ msgstr "Cliquez ici pour ajouter une t�che"
 msgid "Alarms"
 msgstr "Alarmes"
 
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:702
-#: camel/camel-filter-driver.c:819
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:718
+#: camel/camel-filter-driver.c:834
 msgid "Complete"
 msgstr "Termin�"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Completion Date"
 msgstr "Date d'Ach�vement"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Due Date"
 msgstr "Date d'�ch�ance"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "End Date"
 msgstr "Date de fin"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr "Emplacement g�ographique"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Priority"
 msgstr "Priorit�"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 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:15
-#: my-evolution/component-factory.c:30 shell/e-shortcuts.c:1050
-#: shell/e-storage-set-view.c:1424
+#: calendar/gui/e-calendar-table.etspec.h:16
+#: my-evolution/component-factory.c:45 shell/e-shortcuts.c:1050
+#: shell/e-storage-set-view.c:1420 shell/e-summary-storage.c:80
 msgid "Summary"
 msgstr "R�sum�"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 msgid "Task sort"
 msgstr "Tri par t�che"
 
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:19
 msgid "URL"
 msgstr "URL"
 
@@ -4391,7 +4438,7 @@ 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:285 calendar/gui/e-day-view.c:1374
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1458
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -4403,253 +4450,293 @@ 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:608 calendar/gui/e-week-view.c:344
+#: calendar/gui/e-day-view.c:608 calendar/gui/e-week-view.c:345
+#: calendar/gui/print.c:769
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:347
+#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:348
+#: calendar/gui/print.c:771
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3422 calendar/gui/e-week-view.c:3270
+#: calendar/gui/e-day-view.c:3424 calendar/gui/e-week-view.c:3278
 msgid "New All Day _Event"
 msgstr "Nouvel �v�nement de journ�e compl�te"
 
-#: calendar/gui/e-day-view.c:3432 calendar/gui/e-week-view.c:3280
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3288
 #: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "Aller � aujourd'hui"
 
-#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3282
+#: calendar/gui/e-day-view.c:3436 calendar/gui/e-week-view.c:3290
 msgid "_Go to Date..."
 msgstr "Aller � la date"
 
-#: calendar/gui/e-day-view.c:3443 calendar/gui/e-week-view.c:3290
+#: calendar/gui/e-day-view.c:3445 calendar/gui/e-week-view.c:3298
 msgid "_Delete this Appointment"
 msgstr "Supprimer ce rendez-vous"
 
-#: calendar/gui/e-day-view.c:3462 calendar/gui/e-week-view.c:3315
+#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3323
 msgid "Make this Occurrence _Movable"
 msgstr "Rendre cette occurence d�pla�able"
 
-#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3317
+#: calendar/gui/e-day-view.c:3466 calendar/gui/e-week-view.c:3325
 msgid "Delete this _Occurrence"
 msgstr "Supprimer cette occurence"
 
-#: calendar/gui/e-day-view.c:3466 calendar/gui/e-week-view.c:3319
+#: calendar/gui/e-day-view.c:3468 calendar/gui/e-week-view.c:3327
 msgid "Delete _All Occurrences"
 msgstr "Supprimer toutes les occurences"
 
-#: calendar/gui/e-itip-control.c:741
+#: calendar/gui/e-itip-control.c:469
+msgid "Meeting begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:474
+msgid "Task begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:479
+#, fuzzy
+msgid "Free/Busy info begins: <b>"
+msgstr "Information Libre-Occup�"
+
+#: calendar/gui/e-itip-control.c:483
+msgid "Begins: <b>"
+msgstr ""
+
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:677
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:692
+#, c-format
+msgid "<b>Summary:</b> %s<br><br>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:692
+msgid "<i>None</i>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:702
+#, fuzzy, c-format
+msgid "<b>Description:</b> %s"
+msgstr "Description :"
+
+#: calendar/gui/e-itip-control.c:737
 #, 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:742
+#: calendar/gui/e-itip-control.c:738
 msgid "Meeting Information"
 msgstr "Informations de la r�union"
 
-#: calendar/gui/e-itip-control.c:746
+#: calendar/gui/e-itip-control.c:742
 #, 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:747
+#: calendar/gui/e-itip-control.c:743
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "Proposition de r�union"
 
-#: calendar/gui/e-itip-control.c:751
+#: calendar/gui/e-itip-control.c:747
 #, 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:752
+#: calendar/gui/e-itip-control.c:748
 msgid "Meeting Update"
 msgstr "Mise � jour de la r�union"
 
-#: calendar/gui/e-itip-control.c:756
+#: calendar/gui/e-itip-control.c:752
 #, 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:757
+#: calendar/gui/e-itip-control.c:753
 msgid "Meeting Update Request"
 msgstr "Demande de mise � jour de la r�union"
 
-#: calendar/gui/e-itip-control.c:761
+#: calendar/gui/e-itip-control.c:757
 #, fuzzy, 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:762
+#: calendar/gui/e-itip-control.c:758
 msgid "Meeting Reply"
 msgstr "R�ponse � une r�union"
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:762
 #, 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:767
+#: calendar/gui/e-itip-control.c:763
 msgid "Meeting Cancellation"
 msgstr "Annulation de r�union"
 
-#: calendar/gui/e-itip-control.c:771 calendar/gui/e-itip-control.c:819
-#: calendar/gui/e-itip-control.c:852
+#: calendar/gui/e-itip-control.c:767 calendar/gui/e-itip-control.c:815
+#: calendar/gui/e-itip-control.c:848
 #, 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:772
+#: calendar/gui/e-itip-control.c:768
 msgid "Bad Meeting Message"
 msgstr "Mauvais message de r�union"
 
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:785
 #, 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:790
+#: calendar/gui/e-itip-control.c:786
 msgid "Task Information"
 msgstr "Informations de la t�che"
 
-#: calendar/gui/e-itip-control.c:794
+#: calendar/gui/e-itip-control.c:790
 #, 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:795
+#: calendar/gui/e-itip-control.c:791
 msgid "Task Proposal"
 msgstr "T�che propos�e"
 
-#: calendar/gui/e-itip-control.c:799
+#: calendar/gui/e-itip-control.c:795
 #, 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:800
+#: calendar/gui/e-itip-control.c:796
 msgid "Task Update"
 msgstr "Mise � jour de t�che"
 
-#: calendar/gui/e-itip-control.c:804
+#: calendar/gui/e-itip-control.c:800
 #, 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:805
+#: calendar/gui/e-itip-control.c:801
 msgid "Task Update Request"
 msgstr "Demande de mise � jour de t�che"
 
-#: calendar/gui/e-itip-control.c:809
+#: calendar/gui/e-itip-control.c:805
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> a r�pondu � une t�che."
 
-#: calendar/gui/e-itip-control.c:810
+#: calendar/gui/e-itip-control.c:806
 msgid "Task Reply"
 msgstr "R�pondre � la t�che"
 
-#: calendar/gui/e-itip-control.c:814
+#: calendar/gui/e-itip-control.c:810
 #, 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:815
+#: calendar/gui/e-itip-control.c:811
 msgid "Task Cancellation"
 msgstr "Annulation de t�che"
 
-#: calendar/gui/e-itip-control.c:820
+#: calendar/gui/e-itip-control.c:816
 msgid "Bad Task Message"
 msgstr "Mauvais message de t�che"
 
-#: calendar/gui/e-itip-control.c:837
+#: calendar/gui/e-itip-control.c:833
 #, 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:838
+#: calendar/gui/e-itip-control.c:834
 msgid "Free/Busy Information"
 msgstr "Information Libre-Occup�"
 
-#: calendar/gui/e-itip-control.c:842
+#: calendar/gui/e-itip-control.c:838
 #, fuzzy, 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:843
+#: calendar/gui/e-itip-control.c:839
 msgid "Free/Busy Request"
 msgstr "Demande Libre-Occup�"
 
-#: calendar/gui/e-itip-control.c:847
+#: calendar/gui/e-itip-control.c:843
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</> a r�pondu � une demande Libre-Occup�"
 
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:844
 msgid "Free/Busy Reply"
 msgstr "R�ponse Libre-Occup�"
 
-#: calendar/gui/e-itip-control.c:853
+#: calendar/gui/e-itip-control.c:849
 msgid "Bad Free/Busy Message"
 msgstr "Mauvais message Libre-Occup�"
 
-#: calendar/gui/e-itip-control.c:920
+#: calendar/gui/e-itip-control.c:916
 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:939
+#: calendar/gui/e-itip-control.c:935
 #, fuzzy
 msgid "The message contains only unsupported requests."
 msgstr "Le message contient seulement des destinataires Bcc"
 
-#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:973
+#: calendar/gui/e-itip-control.c:963 calendar/gui/e-itip-control.c:969
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1092
+#: calendar/gui/e-itip-control.c:1088
 #, fuzzy
 msgid "Calendar file could not be updated!\n"
 msgstr "L'item n'a pas pu �tre envoy� !\n"
 
-#: calendar/gui/e-itip-control.c:1094
+#: calendar/gui/e-itip-control.c:1090
 msgid "Update complete\n"
 msgstr "Mise � jour termin�e\n"
 
-#: calendar/gui/e-itip-control.c:1138
+#: calendar/gui/e-itip-control.c:1134
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1142
 msgid "Attendee status ould not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1144
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1146
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1178
+#: calendar/gui/e-itip-control.c:1174
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "Je ne peux supprimer l'item de votre fichier de calendrier !\n"
 
-#: calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1176
 msgid "Removal Complete"
 msgstr "Effacement Termin�"
 
-#: calendar/gui/e-itip-control.c:1212 calendar/gui/e-itip-control.c:1247
+#: calendar/gui/e-itip-control.c:1208 calendar/gui/e-itip-control.c:1242
 msgid "Item sent!\n"
 msgstr "Item envoy� !\n"
 
-#: calendar/gui/e-itip-control.c:1214 calendar/gui/e-itip-control.c:1251
+#: calendar/gui/e-itip-control.c:1210 calendar/gui/e-itip-control.c:1246
 msgid "The item could not be sent!\n"
 msgstr "L'item n'a pas pu �tre envoy� !\n"
 
-#: calendar/gui/e-itip-control.c:1411
+#: calendar/gui/e-itip-control.c:1406
 msgid "Unable to find any of your identities in the attendees list!\n"
 msgstr ""
 
@@ -4710,6 +4797,14 @@ msgstr "Ressource"
 msgid "Room"
 msgstr "Salle"
 
+#: calendar/gui/e-meeting-model.c:226 calendar/gui/e-meeting-model.c:261
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:674
+#: calendar/gui/e-meeting-model.c:690
+#: camel/providers/smtp/camel-smtp-transport.c:224
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
+msgid "Unknown"
+msgstr "Inconnu"
+
 #: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
 #: calendar/gui/e-meeting-model.c:686
 msgid "Chair"
@@ -4762,14 +4857,14 @@ msgstr "En cours"
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:472
-#: calendar/gui/e-meeting-time-sel.c:1936
+#: calendar/gui/e-meeting-time-sel.c:1937
 msgid "%A, %B %d, %Y"
 msgstr "%A %d %B %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:476
-#: calendar/gui/e-meeting-time-sel.c:1964 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:1965 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:345
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
@@ -4777,7 +4872,7 @@ msgstr "%a %d/%m/%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:480 e-util/e-time-utils.c:221
-#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1552
+#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1577
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
@@ -4855,16 +4950,16 @@ msgstr "Ne peut charger les t�ches dans � %s �"
 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-week-view.c:3268 calendar/gui/e-week-view.c:3306
+#: calendar/gui/e-week-view.c:3276 calendar/gui/e-week-view.c:3314
 msgid "New _Appointment..."
 msgstr "Nouveau _RDV"
 
-#: calendar/gui/gnome-cal.c:1318
+#: calendar/gui/gnome-cal.c:1319
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Ne peut ouvrir le dossier dans � %s �"
 
-#: calendar/gui/gnome-cal.c:1329
+#: calendar/gui/gnome-cal.c:1330
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "La m�thode requise pour ouvrir � %s � n'est pas support�e"
@@ -4934,201 +5029,201 @@ msgstr "Un organizer doit �tre configur�"
 msgid "Could not create the component editor factory"
 msgstr "Ne peut cr�er l'utilitaire de notification d'alarme"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "1st"
 msgstr "1er"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "2nd"
 msgstr "2�me"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "3rd"
 msgstr "3�me"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "4th"
 msgstr "4�me"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "5th"
 msgstr "5�me"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "6th"
 msgstr "6�me"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "7th"
 msgstr "7�me"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "8th"
 msgstr "8�me"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "9th"
 msgstr "9�me"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "10th"
 msgstr "10�me"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "11th"
 msgstr "11�me"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "12th"
 msgstr "12�me"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "13th"
 msgstr "13�me"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "14th"
 msgstr "14�me"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "15th"
 msgstr "15�me"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "16th"
 msgstr "16�me"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "17th"
 msgstr "17�me"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "18th"
 msgstr "18�me"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "19th"
 msgstr "19�me"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "20th"
 msgstr "20�me"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "21st"
 msgstr "21�me"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "22nd"
 msgstr "22�me"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "23rd"
 msgstr "23�me"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "24th"
 msgstr "24�me"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "25th"
 msgstr "25�me"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "26th"
 msgstr "26�me"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "27th"
 msgstr "27�me"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "28th"
 msgstr "28�me"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "29th"
 msgstr "29�me"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "30th"
 msgstr "30�me"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:432
 msgid "31st"
 msgstr "31�me"
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "Su"
 msgstr "Di"
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "Mo"
 msgstr "Lu"
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "Tu"
 msgstr "Ma"
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "We"
 msgstr "Me"
 
-#: calendar/gui/print.c:497
+#: calendar/gui/print.c:500
 msgid "Th"
 msgstr "Je"
 
-#: calendar/gui/print.c:497
+#: calendar/gui/print.c:500
 msgid "Fr"
 msgstr "Ve"
 
-#: calendar/gui/print.c:497
+#: calendar/gui/print.c:500
 msgid "Sa"
 msgstr "Sa"
 
 #. Day
-#: calendar/gui/print.c:1827
+#: calendar/gui/print.c:1831
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Jour s�lectionn� (%a %d %b %Y)"
 
-#: calendar/gui/print.c:1846 calendar/gui/print.c:1850
+#: calendar/gui/print.c:1850 calendar/gui/print.c:1854
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1847
+#: calendar/gui/print.c:1851
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1858
+#: calendar/gui/print.c:1862
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Semaine s�lectionn�e (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1866
+#: calendar/gui/print.c:1870
 msgid "Selected month (%b %Y)"
 msgstr "Mois s�lectionn� (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1873
+#: calendar/gui/print.c:1877
 msgid "Selected year (%Y)"
 msgstr "Ann�e s�lectionn�e (%Y)"
 
-#: calendar/gui/print.c:2214
+#: calendar/gui/print.c:2221
 msgid "Print Calendar"
 msgstr "Imprimer le Calendrier"
 
-#: calendar/gui/print.c:2302 calendar/gui/print.c:2394
-#: mail/mail-callbacks.c:2071 my-evolution/e-summary.c:551
+#: calendar/gui/print.c:2312 calendar/gui/print.c:2404
+#: mail/mail-callbacks.c:2080 my-evolution/e-summary.c:607
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
 msgstr "Aper�u Avant Impression"
 
-#: calendar/gui/print.c:2331
+#: calendar/gui/print.c:2341
 msgid "Print Item"
 msgstr "Imprime cet �l�ment"
 
-#: calendar/gui/print.c:2412
+#: calendar/gui/print.c:2422
 msgid "Print Setup"
 msgstr "Configuration de l'impression"
 
@@ -5333,66 +5428,78 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr "Resynchronisation avec le serveur"
 
-#: camel/camel-disco-store.c:305
+#: camel/camel-disco-store.c:336
 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:533 camel/camel-filter-driver.c:542
+#: camel/camel-filter-driver.c:549 camel/camel-filter-driver.c:558
 msgid "Syncing folders"
 msgstr "Synchronisation des dossiers"
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:659
 msgid "Unable to open spool folder"
 msgstr "Impossible d'ouvrir le dossier de spool"
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:668
 msgid "Unable to process spool folder"
 msgstr "Ne peut traiter le dossier de spool"
 
-#: camel/camel-filter-driver.c:667
+#: camel/camel-filter-driver.c:683
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Obtention du message %d du %d"
 
-#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
+#: camel/camel-filter-driver.c:687 camel/camel-filter-driver.c:700
 #, c-format
 msgid "Failed on message %d"
 msgstr "Anomalie message %d"
 
-#: camel/camel-filter-driver.c:672
+#: camel/camel-filter-driver.c:688
 msgid "Cannot open message"
 msgstr "Ne peut ouvrir le message"
 
-#: camel/camel-filter-driver.c:698 camel/camel-filter-driver.c:814
+#: camel/camel-filter-driver.c:714 camel/camel-filter-driver.c:829
 msgid "Syncing folder"
 msgstr "Synchronisation du dossier"
 
-#: camel/camel-filter-driver.c:770
+#: camel/camel-filter-driver.c:786
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Obtention du message %d du %d"
 
-#: camel/camel-filter-driver.c:775 camel/camel-filter-driver.c:793
+#: camel/camel-filter-driver.c:791 camel/camel-filter-driver.c:809
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Anomalie message %d du %d"
 
-#: camel/camel-filter-driver.c:900
+#: camel/camel-filter-driver.c:918
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Erreur analyse filtre : %s : %s"
 
-#: camel/camel-filter-driver.c:906
+#: camel/camel-filter-driver.c:924
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Erreur ex�cution du filtre : %s : %s"
 
-#: camel/camel-filter-search.c:479 camel/camel-filter-search.c:486
+#: camel/camel-filter-search.c:494 camel/camel-filter-search.c:501
 #, fuzzy, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Erreur ex�cution recherche filtre : %s : %s"
 
-#: camel/camel-folder.c:1210
+#: camel/camel-folder.c:472
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1039
+#, fuzzy, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr ""
+"Erreur ex�cution  de l'expression de recherche : %s :\n"
+"%s"
+
+#: camel/camel-folder.c:1219
 #, fuzzy
 msgid "Moving messages"
 msgstr "Copie du message"
@@ -5424,7 +5531,7 @@ msgstr "(compare tout) demande un unique r�sultat bool�en"
 msgid "Performing query on unknown header: %s"
 msgstr "Interrogation sur ent�te inconnue : %s"
 
-#: camel/camel-folder-search.c:747 camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:748 camel/camel-folder-search.c:792
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Type inconnu dans le corps, attend une cha�ne"
 
@@ -5526,83 +5633,83 @@ 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-pgp-context.c:193
+#: camel/camel-pgp-context.c:191
 #, fuzzy, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Veuillez saisir votre %s  �Passphrase� pour  %s"
 
-#: camel/camel-pgp-context.c:196
+#: camel/camel-pgp-context.c:194
 #, fuzzy, c-format
 msgid "Please enter your %s passphrase"
 msgstr "Veuillez saisir votre �Passphrase� %s"
 
-#: camel/camel-pgp-context.c:518
+#: camel/camel-pgp-context.c:525
 #, fuzzy
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr "Ne peut envoyer le message : aucun destinataire n'est d�fini."
 
-#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:532 camel/camel-pgp-context.c:706
 #, fuzzy
 msgid "Cannot sign this message: no password provided"
 msgstr ""
 "Ne peut envoyer le message : l'adresse de l'exp�diteur n'est pas valide"
 
-#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:538 camel/camel-pgp-context.c:712
 #, fuzzy, c-format
 msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "Ne peut cr�er le tube vers GPG/PGP : %s"
 
-#: camel/camel-pgp-context.c:693
+#: camel/camel-pgp-context.c:699
 #, fuzzy
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr "Ne peut envoyer le message : aucun destinataire n'est d�fini."
 
-#: camel/camel-pgp-context.c:886
+#: camel/camel-pgp-context.c:891
 #, fuzzy
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr "Ne peut envoyer le message : aucun destinataire n'est d�fini."
 
-#: camel/camel-pgp-context.c:892
+#: camel/camel-pgp-context.c:897
 #, fuzzy, c-format
 msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "Ne peut cr�er le tube vers GPG/PGP : %s"
 
-#: camel/camel-pgp-context.c:903
+#: camel/camel-pgp-context.c:908
 #, fuzzy, c-format
 msgid "Cannot verify this message: couldn't create temp file: %s"
 msgstr "Ne peut cr�er le fichier temporaire : %s"
 
-#: camel/camel-pgp-context.c:1069
+#: camel/camel-pgp-context.c:1076
 #, fuzzy
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr "Ne peut envoyer le message : aucun destinataire n'est d�fini."
 
-#: camel/camel-pgp-context.c:1079
+#: camel/camel-pgp-context.c:1086
 #, fuzzy
 msgid "Cannot encrypt this message: no password provided"
 msgstr ""
 "Ne peut envoyer le message : l'adresse de l'exp�diteur n'est pas valide"
 
-#: camel/camel-pgp-context.c:1086
+#: camel/camel-pgp-context.c:1093
 #, fuzzy, c-format
 msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "Ne peut cr�er le tube vers GPG/PGP : %s"
 
-#: camel/camel-pgp-context.c:1095
+#: camel/camel-pgp-context.c:1102
 #, fuzzy
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr "Ne peut envoyer le message : aucun destinataire n'est d�fini."
 
-#: camel/camel-pgp-context.c:1258
+#: camel/camel-pgp-context.c:1264
 #, fuzzy
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr "Ne peut envoyer le message : aucun destinataire n'est d�fini."
 
-#: camel/camel-pgp-context.c:1266
+#: camel/camel-pgp-context.c:1272
 msgid "Cannot decrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1273
+#: camel/camel-pgp-context.c:1279
 #, fuzzy, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "Ne peut cr�er le tube vers GPG/PGP : %s"
@@ -5648,13 +5755,13 @@ msgstr "Ne peut se connecter � %s (port %d) : %s"
 msgid "(unknown host)"
 msgstr "(H�te inconnu)"
 
-#: camel/camel-remote-store.c:361 camel/camel-remote-store.c:423
-#: camel/camel-remote-store.c:486
+#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
+#: camel/camel-remote-store.c:483
 #: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "Op�ration annul�e"
 
-#: camel/camel-remote-store.c:489
+#: camel/camel-remote-store.c:486
 #, fuzzy, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Serveur subitement d�connect�."
@@ -5768,7 +5875,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:492
+#: camel/providers/imap/camel-imap-store.c:494
 msgid "Bad authentication response from server."
 msgstr "Mauvaise r�ponse d'identification du serveur."
 
@@ -5787,7 +5894,7 @@ msgstr "Etat Authentification inconnue."
 
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:302
-#: camel/providers/pop3/camel-pop3-provider.c:68 mail/mail-config.glade.h:54
+#: camel/providers/pop3/camel-pop3-provider.c:68 mail/mail-config.glade.h:55
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -5816,37 +5923,37 @@ msgstr "POP avant authentification SMTP utilisant une source non-pop"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr " �chec compilation d'expression r�guli�re : %s : %s"
 
-#: camel/camel-service.c:154
+#: camel/camel-service.c:157
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "L'URL � %s � n�cessite un  � nom d'utilisateur �"
 
-#: camel/camel-service.c:162
+#: camel/camel-service.c:165
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "L'URL � %s �  n�cessite un composant  � Host �"
 
-#: camel/camel-service.c:170
+#: camel/camel-service.c:173
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "L'URL � %s � n�cessite un chemin"
 
-#: camel/camel-service.c:548
+#: camel/camel-service.c:602
 #, c-format
 msgid "Resolving: %s"
 msgstr "R�solution de : %s"
 
-#: camel/camel-service.c:575
+#: camel/camel-service.c:629
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "�chec de la r�solution du nom : %s"
 
-#: camel/camel-service.c:600
+#: camel/camel-service.c:654
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "�chec de la r�solution de l'h�te : %s : h�te non trouv�"
 
-#: camel/camel-service.c:602
+#: camel/camel-service.c:656
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "�chec de la r�solution de l'h�te : %s : raison inconnue"
@@ -5861,12 +5968,12 @@ msgid "For reading mail as a query of another set of folders"
 msgstr ""
 "Pour la lecture du courrier comme requ�te a un autre ensemble de dossiers"
 
-#: camel/camel-session.c:322 camel/camel-session.c:391
+#: camel/camel-session.c:324 camel/camel-session.c:393
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Aucun fournisseur disponible pour le protocole � %s �"
 
-#: camel/camel-session.c:508
+#: camel/camel-session.c:510
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -5917,7 +6024,7 @@ msgstr "�chec de v�rification des certificats."
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Ne peut obtenir le r�pertoire : %s : %s"
 
-#: camel/camel-tcp-stream-openssl.c:464
+#: camel/camel-tcp-stream-openssl.c:491
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -5927,7 +6034,7 @@ msgstr ""
 "Sujet : %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:469 camel/camel-tcp-stream-ssl.c:369
+#: camel/camel-tcp-stream-openssl.c:496 camel/camel-tcp-stream-ssl.c:369
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -5966,41 +6073,41 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Ne peut analyser l'URL � %s �"
 
-#: camel/camel-vee-folder.c:546
+#: camel/camel-vee-folder.c:554
 #, fuzzy, c-format
 msgid "No such message %s in %s"
 msgstr "Pas de tel message %s dans %s"
 
-#: camel/camel-vee-folder.c:641
+#: camel/camel-vee-folder.c:649
 #, fuzzy, c-format
 msgid "No such message: %s"
 msgstr "Aucun message correspondant : %s"
 
-#: camel/camel-vee-store.c:251
+#: camel/camel-vee-store.c:250
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr ""
 "Ne peut supprimer le dossier :\n"
 "� %s �"
 
-#: camel/camel-vee-store.c:287
+#: camel/camel-vee-store.c:286
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr ""
 "Ne peut supprimer le dossier :\n"
 "� %s �"
 
-#: camel/camel-vee-store.c:299
+#: camel/camel-vee-store.c:298
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Impossible de renommer le dossier � %s � : %s existe"
 
-#: camel/camel-vee-store.c:327
+#: camel/camel-vee-store.c:326
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Impossible de renommer le dossier %s vers %s : %s"
 
-#: camel/camel-vtrash-folder.c:106
+#: camel/camel-vtrash-folder.c:109
 msgid "You cannot copy messages from this trash folder."
 msgstr "Vous ne pouvez copier des messages de ce dossier corbeille"
 
@@ -6048,7 +6155,7 @@ msgid "Scanning for changed messages"
 msgstr "Examen des messages modifi�s"
 
 #: camel/providers/imap/camel-imap-folder.c:1491
-#: camel/providers/imap/camel-imap-folder.c:1890
+#: camel/providers/imap/camel-imap-folder.c:1899
 msgid "This message is not currently available"
 msgstr "Ce message n'est pas disponible"
 
@@ -6061,7 +6168,7 @@ msgstr "Recherche des informations de r�sum� pour des nouveaux messages"
 msgid "Scanning for new messages"
 msgstr "Examen des nouveaux messages"
 
-#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/imap/camel-imap-folder.c:1936
 msgid "Could not find message body in FETCH response."
 msgstr "Ne peut trouver le corps du message dans la r�ponse FETCH."
 
@@ -6078,7 +6185,7 @@ msgstr "Ne peut ouvrir le directory de cache : %s"
 msgid "Failed to cache message %s: %s"
 msgstr "�chec de d�codage du message."
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:14
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:15
 msgid "Checking for new mail"
 msgstr "V�rification si nouveau courrier"
 
@@ -6086,7 +6193,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:733
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:767
 msgid "Folders"
 msgstr "Dossiers"
 
@@ -6123,30 +6230,30 @@ msgstr ""
 "Cette option vous connectera au serveur IMAP en utilisant un mots de passe "
 "en clair."
 
-#: camel/providers/imap/camel-imap-store.c:515
+#: camel/providers/imap/camel-imap-store.c:517
 #, fuzzy, 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'identification demand�/nde "
 "type %s"
 
-#: camel/providers/imap/camel-imap-store.c:525
+#: camel/providers/imap/camel-imap-store.c:527
 #: camel/providers/smtp/camel-smtp-transport.c:388
 #, fuzzy, c-format
 msgid "No support for authentication type %s"
 msgstr "Aucun support pour le type d'authentification %s"
 
-#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap/camel-imap-store.c:551
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sVeuillez entrer le mot de passe IMAP pour %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:566
 #: camel/providers/smtp/camel-smtp-transport.c:432
 msgid "You didn't enter a password."
 msgstr "Vous n'avez pas entr� de mot de passe."
 
-#: camel/providers/imap/camel-imap-store.c:590
+#: camel/providers/imap/camel-imap-store.c:592
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6157,12 +6264,12 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:889
+#: camel/providers/imap/camel-imap-store.c:891
 #, c-format
 msgid "No such folder %s"
 msgstr "Pas de tel dossier � %s �."
 
-#: camel/providers/imap/camel-imap-store.c:1090
+#: camel/providers/imap/camel-imap-store.c:1131
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Le dossier parent n'est pas autoris� � contenir des sous-dossiers"
 
@@ -6203,55 +6310,55 @@ msgstr ""
 "Pour stocker le courrier local dans des r�pertoires de courrier au format "
 "qmail"
 
-#: camel/providers/local/camel-local-provider.c:77
+#: camel/providers/local/camel-local-provider.c:78
 #, fuzzy
 msgid "Standard Unix mbox spools"
 msgstr "mbox Unix standard"
 
-#: camel/providers/local/camel-local-provider.c:78
+#: camel/providers/local/camel-local-provider.c:79
 #, fuzzy
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr ""
 "Pour stocker le courrier local dans des r�pertoires de courrier au format "
 "qmail"
 
-#: camel/providers/local/camel-local-store.c:127
-#: camel/providers/local/camel-spool-store.c:112
+#: camel/providers/local/camel-local-store.c:132
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "La racine de stockage %s n'est pas un chemin absolu"
 
-#: camel/providers/local/camel-local-store.c:134
+#: camel/providers/local/camel-local-store.c:139
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "La racine de stockage %s n'est pas un r�pertoire habituel"
 
-#: camel/providers/local/camel-local-store.c:142
-#: camel/providers/local/camel-local-store.c:158
+#: camel/providers/local/camel-local-store.c:147
+#: camel/providers/local/camel-local-store.c:163
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Ne peut obtenir le r�pertoire : %s : %s"
 
-#: camel/providers/local/camel-local-store.c:173
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "Le stockage local n'a pas un �inbox� "
 
-#: camel/providers/local/camel-local-store.c:183
+#: camel/providers/local/camel-local-store.c:190
 #, c-format
 msgid "Local mail file %s"
 msgstr "Fichier de courrier local %s"
 
-#: camel/providers/local/camel-local-store.c:240
+#: camel/providers/local/camel-local-store.c:247
 #, 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:282
+#: camel/providers/local/camel-local-store.c:289
 #, 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:292
+#: camel/providers/local/camel-local-store.c:299
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Impossible de supprimer le fichier d'index de dossier � %s � : %s"
@@ -6542,26 +6649,26 @@ msgstr "Ne peut ouvrir le r�peroire MH : %s : %s"
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "Impossible de joindre le message au fichier mbox : %s : %s"
 
-#: camel/providers/local/camel-spool-store.c:133
+#: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Spool `%s' does not exist or is not a regular file"
 msgstr "Spool � %s � n'existe pas ou n'est pas un fichier normal."
 
-#: camel/providers/local/camel-spool-store.c:159
+#: camel/providers/local/camel-spool-store.c:142
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Le dossier � %s/%s � n'existe pas."
 
-#: camel/providers/local/camel-spool-store.c:181
+#: camel/providers/local/camel-spool-store.c:164
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Fichier de courrier spool %s"
 
-#: camel/providers/local/camel-spool-store.c:227
+#: camel/providers/local/camel-spool-store.c:210
 msgid "Spool folders cannot be renamed"
 msgstr "Les dossiers spool  ne peuvent �tre renomm�s."
 
-#: camel/providers/local/camel-spool-store.c:235
+#: camel/providers/local/camel-spool-store.c:218
 msgid "Spool folders cannot be deleted"
 msgstr "Les dossiers spool  ne peuvent �tre effac�s."
 
@@ -6691,32 +6798,32 @@ msgstr "R�cup�ration r�sum� POP"
 msgid "Could not check POP server for new messages: %s"
 msgstr "Ne peut verifier si le serveur POP a de nouveaux messages : %s."
 
-#: camel/providers/pop3/camel-pop3-folder.c:235
+#: camel/providers/pop3/camel-pop3-folder.c:242
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 "Impossible d'ouvrir le dossier : la liste des messages �tait incomplete."
 
-#: camel/providers/pop3/camel-pop3-folder.c:259
+#: camel/providers/pop3/camel-pop3-folder.c:266
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "Couper les messages s�lectionn�s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:335
+#: camel/providers/pop3/camel-pop3-folder.c:342
 #, fuzzy, c-format
 msgid "Could not fetch message: %s"
 msgstr "Ne peut r�cup�rer le message : %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:351
+#: camel/providers/pop3/camel-pop3-folder.c:358
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Ne pas r�cup�rer le message du serveur POP %s : %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:374
+#: camel/providers/pop3/camel-pop3-folder.c:381
 #, c-format
 msgid "No message with uid %s"
 msgstr "Aucun message avec l'uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:378
+#: camel/providers/pop3/camel-pop3-folder.c:385
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "R�cup�ration du message POP %d"
@@ -6734,7 +6841,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:51 mail/mail-config.glade.h:53
+#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:54
 msgid "POP"
 msgstr "POP"
 
@@ -6830,7 +6937,7 @@ msgid "Unexpected response from POP server: %s"
 msgstr "R�ponse inattendue du serveur IMAP : %s"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:73
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -6884,7 +6991,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Livraison du courrier via le programme sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:66
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -7517,13 +7624,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:309 e-util/e-time-utils.c:396
-#: widgets/misc/e-dateedit.c:1360 widgets/misc/e-dateedit.c:1587
+#: widgets/misc/e-dateedit.c:1385 widgets/misc/e-dateedit.c:1612
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:313 e-util/e-time-utils.c:388
-#: widgets/misc/e-dateedit.c:1357 widgets/misc/e-dateedit.c:1584
+#: widgets/misc/e-dateedit.c:1382 widgets/misc/e-dateedit.c:1609
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -7673,8 +7780,8 @@ msgstr ""
 "Revenez en arri�re et sp�cifiez un dossier valide pour\n"
 "d�livrer du courrier A."
 
-#: filter/filter-folder.c:232 filter/vfolder-rule.c:351
-#: mail/mail-account-gui.c:820
+#: filter/filter-folder.c:232 filter/vfolder-rule.c:356
+#: mail/mail-account-gui.c:822
 msgid "Select Folder"
 msgstr "S�lectionnez un Dossier"
 
@@ -7925,7 +8032,7 @@ msgstr "R�pondu �"
 msgid "Score"
 msgstr "Score"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1242
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1251
 msgid "Sender"
 msgstr "Exp�diteur"
 
@@ -7957,7 +8064,7 @@ msgstr "D�bute par"
 msgid "Stop Processing"
 msgstr "Arr�te le traitement"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:893
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:917
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Sujet"
@@ -7987,7 +8094,7 @@ msgstr "�diter la r�gle"
 msgid "Score Rules"
 msgstr "R�gles de score"
 
-#: filter/vfolder-rule.c:203
+#: filter/vfolder-rule.c:206
 msgid "Oops.  You need to to specify at least one folder as a source."
 msgstr "Youah. Vous devez sp�cifier au moins un dossier comme source."
 
@@ -8006,19 +8113,19 @@ msgstr "Importation"
 msgid "Please wait"
 msgstr "Attendez S.V.P"
 
-#: importers/elm-importer.c:171 importers/netscape-importer.c:701
+#: importers/elm-importer.c:171 importers/netscape-importer.c:708
 #: importers/pine-importer.c:369
 #, fuzzy, c-format
 msgid "Importing %s as %s"
 msgstr "Importation"
 
-#: importers/elm-importer.c:377 importers/netscape-importer.c:794
+#: importers/elm-importer.c:377 importers/netscape-importer.c:801
 #: importers/pine-importer.c:506
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "V�rification de � %s �"
 
-#: importers/elm-importer.c:528 importers/netscape-importer.c:967
+#: importers/elm-importer.c:528 importers/netscape-importer.c:974
 #: importers/pine-importer.c:669 mail/component-factory.c:96
 msgid "Mail"
 msgstr "Courrier"
@@ -8056,20 +8163,20 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importe vos anciennes donn�es Netscape"
 
-#: importers/netscape-importer.c:897 importers/pine-importer.c:602
+#: importers/netscape-importer.c:904 importers/pine-importer.c:602
 #, fuzzy
 msgid "Scanning directory"
 msgstr "Scrutation des dossiers dans � %s �"
 
-#: importers/netscape-importer.c:906
+#: importers/netscape-importer.c:913
 msgid "Starting import"
 msgstr "D�but importation :"
 
-#: importers/netscape-importer.c:972
+#: importers/netscape-importer.c:979
 msgid "Settings"
 msgstr "_R�glages"
 
-#: importers/netscape-importer.c:993
+#: importers/netscape-importer.c:1000
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8157,19 +8264,25 @@ msgstr "_Propri�t�s..."
 msgid "Change this folder's properties"
 msgstr "Modifier les propri�t�s de ce dossier"
 
-#: mail/component-factory.c:790
+#: mail/component-factory.c:698
+msgid ""
+"Some of your mail settings seem corrupt, please check that everything is in "
+"order."
+msgstr ""
+
+#: mail/component-factory.c:812
 msgid "New Mail Message"
 msgstr "Nouveau message �lectronique"
 
-#: mail/component-factory.c:790
+#: mail/component-factory.c:812
 msgid "New _Mail Message"
 msgstr "Nouveau _Message �lectronique"
 
-#: mail/component-factory.c:821
+#: mail/component-factory.c:843
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Ne peut initialiser le composant de messagerie d'Evolution."
 
-#: mail/component-factory.c:1007
+#: mail/component-factory.c:1032
 msgid "Cannot register storage with shell"
 msgstr "Ne peut enregistrer le stockage avec le shell"
 
@@ -8182,159 +8295,159 @@ msgstr "Propri�t�s de � %s �"
 msgid "Properties"
 msgstr "Propri�t�s"
 
-#: mail/folder-browser.c:239 mail/mail-display.c:275
+#: mail/folder-browser.c:262 mail/mail-display.c:275
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Ne peut cr�er de r�pertoire temporaire : %s"
 
-#: mail/folder-browser.c:708
+#: mail/folder-browser.c:734
 #, c-format
 msgid "%d new"
 msgstr "%d nouveaux"
 
-#: mail/folder-browser.c:711 mail/folder-browser.c:716
-#: mail/folder-browser.c:720
+#: mail/folder-browser.c:737 mail/folder-browser.c:742
+#: mail/folder-browser.c:746
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:712
+#: mail/folder-browser.c:738
 #, c-format
 msgid "%d hidden"
 msgstr "%d cach�s"
 
-#: mail/folder-browser.c:717
+#: mail/folder-browser.c:743
 #, fuzzy, c-format
 msgid "%d selected"
 msgstr "%d s�lectionn�s"
 
-#: mail/folder-browser.c:722
+#: mail/folder-browser.c:748
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr "%d non envoy�s"
 
-#: mail/folder-browser.c:724
+#: mail/folder-browser.c:750
 #, c-format
 msgid "%d total"
 msgstr "%d au total"
 
-#: mail/folder-browser.c:958
+#: mail/folder-browser.c:993
 msgid "Create vFolder from Search"
 msgstr "Cr�er un dossier virtuel � partir de la recherche"
 
-#: mail/folder-browser.c:1303
+#: mail/folder-browser.c:1338
 msgid "VFolder on _Subject"
 msgstr "Dossier virtuel sur le sujet"
 
-#: mail/folder-browser.c:1306
+#: mail/folder-browser.c:1341
 msgid "VFolder on Se_nder"
 msgstr "Dossier virtuel sur l'e_xp�diteur"
 
-#: mail/folder-browser.c:1309
+#: mail/folder-browser.c:1344
 msgid "VFolder on _Recipients"
 msgstr "Dossier virtuel sur les de_stinataires"
 
-#: mail/folder-browser.c:1312
+#: mail/folder-browser.c:1347
 msgid "VFolder on Mailing _List"
 msgstr "Dossier virtuel sur la liste de diffusion"
 
-#: mail/folder-browser.c:1318
+#: mail/folder-browser.c:1353
 msgid "Filter on Sub_ject"
 msgstr "Filtre sur le sujet"
 
-#: mail/folder-browser.c:1321
+#: mail/folder-browser.c:1356
 msgid "Filter on Sen_der"
 msgstr "Filtre sur l'exp�diteur"
 
-#: mail/folder-browser.c:1324
+#: mail/folder-browser.c:1359
 msgid "Filter on Re_cipients"
 msgstr "Filtre sur les destinataires"
 
-#: mail/folder-browser.c:1327
+#: mail/folder-browser.c:1362
 msgid "Filter on _Mailing List"
 msgstr "Filtre sur la liste de diffusion"
 
-#: mail/folder-browser.c:1338 ui/evolution-mail-message.xml.h:89
+#: mail/folder-browser.c:1373 ui/evolution-mail-message.xml.h:89
 msgid "_Edit as New Message..."
 msgstr "_Editer comme nouveau  message..."
 
-#: mail/folder-browser.c:1340 ui/evolution-mail-message.xml.h:97
+#: mail/folder-browser.c:1375 ui/evolution-mail-message.xml.h:97
 msgid "_Save As..."
 msgstr "Enregistrer _sous..."
 
-#: mail/folder-browser.c:1342
+#: mail/folder-browser.c:1377
 msgid "_Print"
 msgstr "_Imprimer"
 
-#: mail/folder-browser.c:1347 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1382 ui/evolution-mail-message.xml.h:96
 msgid "_Reply to Sender"
 msgstr "R�pondre � l'exp�diteur"
 
-#: mail/folder-browser.c:1349 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1384 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _List"
 msgstr "R�pondre � la _liste"
 
-#: mail/folder-browser.c:1351 ui/evolution-mail-message.xml.h:68
+#: mail/folder-browser.c:1386 ui/evolution-mail-message.xml.h:68
 msgid "Reply to _All"
 msgstr "R�pondre � _tous"
 
-#: mail/folder-browser.c:1353
+#: mail/folder-browser.c:1388
 msgid "_Forward"
 msgstr "_Faire suivre"
 
-#: mail/folder-browser.c:1356 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1391 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "Marquer comme _lu"
 
-#: mail/folder-browser.c:1358 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1393 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Marquer comme _non lu"
 
-#: mail/folder-browser.c:1360
+#: mail/folder-browser.c:1395
 msgid "Mark as _Important"
 msgstr "Marquer comme _Important"
 
-#: mail/folder-browser.c:1362
+#: mail/folder-browser.c:1397
 msgid "Mark as Unim_portant"
 msgstr "Marquer comme Non Im_portant"
 
-#: mail/folder-browser.c:1367
+#: mail/folder-browser.c:1402
 msgid "_Move to Folder..."
 msgstr "_D�placer vers le dossier..."
 
-#: mail/folder-browser.c:1369
+#: mail/folder-browser.c:1404
 msgid "_Copy to Folder..."
 msgstr "_Copier vers le dossier..."
 
-#: mail/folder-browser.c:1373 ui/evolution-mail-message.xml.h:99
+#: mail/folder-browser.c:1408 ui/evolution-mail-message.xml.h:99
 msgid "_Undelete"
 msgstr "_R�cup�rer"
 
-#: mail/folder-browser.c:1378
+#: mail/folder-browser.c:1413
 msgid "Add Sender to Address Book"
 msgstr "Ajouter l'exp�diteur au carnet d'adresses"
 
-#: mail/folder-browser.c:1383
+#: mail/folder-browser.c:1418
 msgid "Apply Filters"
 msgstr "Appliquer les filtres"
 
-#: mail/folder-browser.c:1387
+#: mail/folder-browser.c:1422
 msgid "Create Ru_le From Message"
 msgstr "Cr�er une r�gle � partir du message"
 
-#: mail/folder-browser.c:1538
+#: mail/folder-browser.c:1573
 msgid "Filter on Mailing List"
 msgstr "Filtre sur la liste de diffusion"
 
-#: mail/folder-browser.c:1539
+#: mail/folder-browser.c:1574
 msgid "VFolder on Mailing List"
 msgstr "Dossier virtuel sur la liste de diffusion"
 
-#: mail/folder-browser.c:1541
+#: mail/folder-browser.c:1576
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtre sur la liste de diffusion (%s)"
 
-#: mail/folder-browser.c:1542
+#: mail/folder-browser.c:1577
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Dossier virtuel sur la liste de diffusion (%s)"
@@ -8408,18 +8521,18 @@ msgstr "Editeur de News d'Evolution"
 msgid "Evolution Account Editor"
 msgstr "Editeur de compte d'Evolution"
 
-#: mail/mail-account-gui.c:945
+#: mail/mail-account-gui.c:947
 #, fuzzy
 msgid "Could not save signature file."
 msgstr ""
 "Ne peut ouvrir le fichier de signature %s :\n"
 "%s"
 
-#: mail/mail-account-gui.c:1022
+#: mail/mail-account-gui.c:1024
 msgid "Save signature"
 msgstr "sauver la signature :"
 
-#: mail/mail-account-gui.c:1028
+#: mail/mail-account-gui.c:1030
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -8429,7 +8542,7 @@ msgstr ""
 "\n"
 "Voulez-vous enregistrer vos changements ?"
 
-#: mail/mail-account-gui.c:1611
+#: mail/mail-account-gui.c:1615
 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."
 
@@ -8462,7 +8575,7 @@ msgid "Are you sure you want to delete this news account?"
 msgstr "�tes-vous s�r de vouloir supprimer ce compte de news ?"
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:757 mail/mail-config.glade.h:42
+#: mail/mail-accounts.c:760 mail/mail-config.glade.h:45
 msgid "Mail Settings"
 msgstr "Param�trage Messagerie..."
 
@@ -8569,37 +8682,37 @@ msgstr ""
 msgid "This message contains invalid recipients:"
 msgstr "Le message contient seulement des destinataires Bcc"
 
-#: mail/mail-callbacks.c:453
+#: mail/mail-callbacks.c:454
 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:549
+#: mail/mail-callbacks.c:550
 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:779
+#: mail/mail-callbacks.c:783
 msgid "an unknown sender"
 msgstr "Un exp�diteur inconnu"
 
-#: mail/mail-callbacks.c:784
+#: mail/mail-callbacks.c:788
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "le %a %d-%m-%Y at %H:%M  %%s a �crit :"
 
-#: mail/mail-callbacks.c:1162
+#: mail/mail-callbacks.c:1171
 msgid "Move message(s) to"
 msgstr "D�placez le(s) message(s) vers"
 
-#: mail/mail-callbacks.c:1164
+#: mail/mail-callbacks.c:1173
 msgid "Copy message(s) to"
 msgstr "Copiez le(s) message(s) vers"
 
-#: mail/mail-callbacks.c:1538
+#: mail/mail-callbacks.c:1547
 #, 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:1560
+#: mail/mail-callbacks.c:1569
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -8607,7 +8720,7 @@ msgstr ""
 "Vous ne pouvez �diter des messages que\n"
 "lorsqu'ils sont dans le dossier Brouillons."
 
-#: mail/mail-callbacks.c:1594
+#: mail/mail-callbacks.c:1603
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -8615,28 +8728,28 @@ msgstr ""
 "Vous ne pouvez renvoyer des messages que\n"
 "lorsqu'ils sont dans le dossier Envoy�s."
 
-#: mail/mail-callbacks.c:1606
+#: mail/mail-callbacks.c:1615
 #, 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:1627
+#: mail/mail-callbacks.c:1636
 msgid "No Message Selected"
 msgstr "Aucun message s�lectionn�"
 
-#: mail/mail-callbacks.c:1712
+#: mail/mail-callbacks.c:1721
 msgid "Save Message As..."
 msgstr "Enregistrer le message sous..."
 
-#: mail/mail-callbacks.c:1714
+#: mail/mail-callbacks.c:1723
 msgid "Save Messages As..."
 msgstr "Sauver les messages sous..."
 
-#: mail/mail-callbacks.c:1859 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:1868 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Avertissement"
 
-#: mail/mail-callbacks.c:1864
+#: mail/mail-callbacks.c:1873
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8648,11 +8761,11 @@ msgstr ""
 "\n"
 "Effacer r�ellement ces messages ?"
 
-#: mail/mail-callbacks.c:1871
+#: mail/mail-callbacks.c:1880
 msgid "Do not ask me again."
 msgstr "Ne plus me demander."
 
-#: mail/mail-callbacks.c:1976
+#: mail/mail-callbacks.c:1985
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -8661,19 +8774,19 @@ msgstr ""
 "Erreur de chargement des information du filtre :\n"
 "%s"
 
-#: mail/mail-callbacks.c:1986
+#: mail/mail-callbacks.c:1995
 msgid "Filters"
 msgstr "_Filtres"
 
-#: mail/mail-callbacks.c:2032
+#: mail/mail-callbacks.c:2041
 msgid "Print Message"
 msgstr "Imprimer le message"
 
-#: mail/mail-callbacks.c:2078
+#: mail/mail-callbacks.c:2087
 msgid "Printing of message failed"
 msgstr "�chec de l'impression du message"
 
-#: mail/mail-callbacks.c:2162
+#: mail/mail-callbacks.c:2171
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -8737,72 +8850,108 @@ msgstr ""
 msgid "Evolution Account Assistant"
 msgstr "Assistant de compte d'Evolution"
 
-#: mail/mail-config.c:1851
+#: mail/mail-config.c:315
+#, fuzzy, c-format
+msgid "Account %d"
+msgstr "Compte"
+
+#: mail/mail-config.c:1618
+#, c-format
+msgid ""
+"Could not get inbox for new mail store:\n"
+"%s\n"
+"No shortcut will be created."
+msgstr ""
+
+#. Create the shortcut. FIXME: This only works if the
+#. * full name matches the path.
+#.
+#: mail/mail-config.c:1629
+#, fuzzy, c-format
+msgid "%s: Inbox"
+msgstr "%s : Inbox"
+
+#: mail/mail-config.c:1873
 msgid "Checking Service"
 msgstr "Service de v�rification"
 
-#: mail/mail-config.c:1922 mail/mail-config.c:1925
+#: mail/mail-config.c:1944 mail/mail-config.c:1947
 msgid "Connecting to server..."
 msgstr "Connexion au serveur"
 
 #: mail/mail-config.glade.h:1
+#, fuzzy
+msgid " _Check for supported types "
+msgstr "V�rifier les types support�s..."
+
+#: mail/mail-config.glade.h:2
 msgid " color"
 msgstr "Couleur"
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL n'est pas support� dans cette compilation d'�volution)"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr "Compte"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr "Information du compte"
 
-#: mail/mail-config.glade.h:5 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:6 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Gestionnaire de comptes"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "Accounts"
 msgstr "Comptes"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr "Toujours encrypter lors de l'envoi de courrier"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr "Toujours encrypter lors de l'envoi de courrier"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:10
 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:10 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Pi�ce-jointe"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:12
 msgid "Authentication"
 msgstr "Identification"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:13
 msgid "Authentication Type: "
 msgstr "Type d'identification :"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:14
 msgid "Certificate ID:"
 msgstr "Certificat ID"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:16
 msgid "Composer"
 msgstr "Composeur"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:17
+#, fuzzy
+msgid "Configuration"
+msgstr "Configuration de la messagerie"
+
+#: mail/mail-config.glade.h:18
+#, fuzzy
+msgid "Confirm when Expunging a folder"
+msgstr "Nettoyage du dossier"
+
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -8818,243 +8967,231 @@ msgstr ""
 "\n"
 "Cliquez sur \"Terminer\" pour enregistrer vos nouveaux param�tres."
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr "D�faut"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:26
 msgid "Default Forward style is: "
 msgstr "Le style du transfert par d�faut est : "
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:27
 msgid "Default character encoding: "
 msgstr "Codage caract�re par d�faut"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:29
 msgid "Digital IDs..."
 msgstr "IDs digitales"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:30
 msgid "Display"
 msgstr "Affichage"
 
-#: mail/mail-config.glade.h:27 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:31 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Fait"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:32 shell/e-local-storage.c:174
 msgid "Drafts"
 msgstr "Brouillons"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:33
 msgid "Drafts folder:"
 msgstr "Dossier brouillons"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:34
 msgid "E_nable"
 msgstr "Activer"
 
-#: mail/mail-config.glade.h:31
-msgid "Each account must have a different name."
-msgstr "Chaque compte doit avoir un nom diff�rent."
-
-#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:96
 #: widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr "�diter"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:36
 msgid "Enabled"
 msgstr "Activ�"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:37
 msgid "Get Digital ID..."
 msgstr "Obtenir ID digitale..."
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:38
 msgid "HTML signature file:"
 msgstr "Fichier de signature HTML :"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:39
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:40 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Identit�"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:41
 msgid "In HTML mail"
 msgstr "Entr�e courrier HTML"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:42
 msgid "Inline"
 msgstr "En ligne"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:43
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:44
 msgid "Mail Configuration"
 msgstr "Configuration de la messagerie"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:46
 msgid "Mailbox location"
 msgstr "Localisation de la bo�te � lettres"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:47
 msgid "Make this my _default account"
 msgstr "En faire mon compte par d�faut"
 
-#: mail/mail-config.glade.h:45
-msgid "Message _preview should be displayed by default"
-msgstr "L'_aper�u du message devrait �tre affich� par d�faut"
-
-#: mail/mail-config.glade.h:46
-msgid "Message list should display in a _threaded fashion by default"
-msgstr ""
-"La liste des messages devrait �tre affich�e par _Fil de discussion par d�faut"
-
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 msgid "NNTP Server:"
 msgstr "Serveur NNTP :"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:49
 msgid "News"
 msgstr "Nouvelles"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:51
 msgid "Optional Information"
 msgstr "Informations optionnelles"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:53
 msgid "PGP Key ID:"
 msgstr "ID cl� PGP : "
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 msgid "Pick a color"
 msgstr "Choisissez une couleur"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 msgid "Pretty Good Privacy"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 #, fuzzy
 msgid "Prompt when sending messages with an _empty subject"
 msgstr "Alerte lors de l'envoi d'un message sans sujet"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr ""
 "Alerte lors de l'envoi d'un message avec uniquement des destinataires Bcc"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:60
 msgid "Qmail maildir "
 msgstr "R�pertoire de courrier Qmail"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid "Quoted"
 msgstr "Not�"
 
-#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "R�ception des messages"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:63
 msgid "Receiving Mail"
 msgstr "R�ception des messages"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:64
 msgid "Receiving Options"
 msgstr "R�ception des options"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:65
 msgid "Required Information"
 msgstr "Informations demand�es"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:67
 msgid "Secure MIME"
 msgstr "MIME s�curis�"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:68
 msgid "Security"
 msgstr "_S�curit�"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Select Filter Log file..."
 msgstr "S�lectionner un fichier jounal de filtrage"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:70
 msgid "Select PGP binary"
 msgstr "S�lectionner un binaire PGP"
 
-#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:71 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Envoi du message"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:72
 msgid "Sending Mail"
 msgstr "Envoi du message"
 
-#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:74 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:177
 msgid "Sent"
 msgstr "Envoy�"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:75
 msgid "Sent and Draft Messages"
 msgstr "Messages envoy�s et brouillons"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:76
 msgid "Sent messages folder:"
 msgstr "Dossier messages envoy�"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:77
 msgid "Server Configuration"
 msgstr "Configuration du serveur"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 msgid "Server Type: "
 msgstr "Type de serveur : "
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 msgid "Server requires _authentication"
 msgstr "Le serveur n�cessite une identification"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:80
 msgid "Signature file:"
 msgstr "Fichier de signature :"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "Source"
 msgstr "Source"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "Source Information"
 msgstr "Informations de source"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:83
 msgid "Sources"
 msgstr "Sources"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
 msgid "Special Folders"
 msgstr "Dossiers sp�ciaux"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:85
 msgid "Standard Unix mbox"
 msgstr "mbox Unix standard"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:87
 msgid "Use secure connection (_SSL)"
 msgstr "Utilisez une connexion s�curis�e (SSL)"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:88
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -9064,81 +9201,77 @@ msgstr ""
 "\n"
 "Cliquez sur  �Suivant� pour commencer."
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:92
 msgid "_Always load images off the net"
 msgstr "_Toujours charger les images hors du r�seau"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:93
 msgid "_Automatically check for new mail every"
 msgstr "V�rifier automatiquement la pr�sence de nouveaux messages"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:94
 msgid "_Check for supported types"
 msgstr "V�rifier les types support�s..."
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:97
 msgid "_Email Address:"
 msgstr "Adresse �lectronique :"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:98
 msgid "_Empty trash folders on exit"
 msgstr "_Vider les dossiers corbeille en sortant"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 msgid "_Full Name:"
 msgstr "Nom complet :"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "_HTML Signature:"
 msgstr "Signature _HTML :"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 msgid "_Highlight citations with"
 msgstr "Mettre les citations en _surbrillance"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:102
 msgid "_Host:"
 msgstr "_H�te :"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 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:103
+#: mail/mail-config.glade.h:104
 #, fuzzy
 msgid "_Log filter actions to:"
 msgstr "Filtrage du journal  � : "
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 msgid "_Mark messages as Read after"
 msgstr "_Marquer les messages comme lus apr�s"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "_Name:"
 msgstr "_Nom :"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 #, fuzzy
 msgid "_Never load images off the net"
 msgstr "_Ne jamais charger les images hors du r�seau"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 msgid "_Organization:"
 msgstr "_Organisation :"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:109
 msgid "_PGP binary path:"
 msgstr "Chemin binaire _PGP"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 msgid "_Path:"
 msgstr "Chemin :"
 
-#: mail/mail-config.glade.h:110
-msgid "_Remember PGP Passphrase until exit"
-msgstr "Se rappeler de la  �Passphrase� jusqu'� la sortie"
-
 #: mail/mail-config.glade.h:111
 msgid "_Remember this password"
 msgstr "Se souvenir du mot de passe"
@@ -9172,41 +9305,41 @@ msgstr "propri�taire de l'endroit"
 msgid "seconds."
 msgstr "secondes."
 
-#: mail/mail-crypto.c:60
+#: mail/mail-crypto.c:59
 msgid "Could not create a PGP signature context."
 msgstr "Ne peut cr�er un contexte de signature PGP."
 
-#: mail/mail-crypto.c:86
+#: mail/mail-crypto.c:84
 msgid "Could not create a PGP verification context."
 msgstr "Ne peut cr�er un contexte de v�rification PGP."
 
-#: mail/mail-crypto.c:116
+#: mail/mail-crypto.c:113
 msgid "Could not create a PGP encryption context."
 msgstr "Ne peut cr�er un contexte de codage PGP."
 
-#: mail/mail-crypto.c:142
+#: mail/mail-crypto.c:138
 msgid "Could not create a PGP decryption context."
 msgstr "Ne peut cr�er un contexte de d�codage PGP."
 
-#: mail/mail-crypto.c:177
+#: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
 msgstr "Ne peut cr�er un contexte de signature S/MIME."
 
-#: mail/mail-crypto.c:209
+#: mail/mail-crypto.c:205
 #, fuzzy
 msgid "Could not create a S/MIME certsonly context."
 msgstr "Ne peut cr�er un contexte seulement certifi� S/MIME."
 
-#: mail/mail-crypto.c:240
+#: mail/mail-crypto.c:236
 msgid "Could not create a S/MIME encryption context."
 msgstr "Ne peut cr�er un contexte de codage S/MIME."
 
-#: mail/mail-crypto.c:271
+#: mail/mail-crypto.c:267
 #, fuzzy
 msgid "Could not create a S/MIME envelope context."
 msgstr "Ne peut cr�er un contexte d'enveloppe S/MIME."
 
-#: mail/mail-crypto.c:301
+#: mail/mail-crypto.c:297
 msgid "Could not create a S/MIME decode context."
 msgstr "Ne peut cr�er un contexte de d�codage S/MIME."
 
@@ -9252,11 +9385,11 @@ msgstr "Ouvrir un lien dans le Navigateur"
 msgid "Copy Link Location"
 msgstr "Copier l'emplacement du lien"
 
-#: mail/mail-display.c:1519
+#: mail/mail-display.c:1520
 msgid "Save Link as (FIXME)"
 msgstr "Enregistrer le lien sous (FIXME)"
 
-#: mail/mail-display.c:1521
+#: mail/mail-display.c:1523
 msgid "Save Image as..."
 msgstr "Enregistrer l'image sous..."
 
@@ -9273,86 +9406,86 @@ msgstr "Impossible d'analyser le message MIME. Afficher comme source"
 msgid "Date"
 msgstr "Date"
 
-#: mail/mail-format.c:860
+#: mail/mail-format.c:862
 msgid "Bad Address"
 msgstr "Mauvaise adresse"
 
-#: mail/mail-format.c:882 mail/message-list.etspec.h:3
+#: mail/mail-format.c:903 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "De"
 
-#: mail/mail-format.c:885
+#: mail/mail-format.c:906
 msgid "Reply-To"
 msgstr "R�pondre- � :"
 
-#: mail/mail-format.c:888 mail/message-list.etspec.h:10
+#: mail/mail-format.c:910 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "�"
 
-#: mail/mail-format.c:891
+#: mail/mail-format.c:914
 msgid "Cc"
 msgstr "Cc :"
 
-#: mail/mail-format.c:1311
+#: mail/mail-format.c:1357
 msgid "No GPG/PGP program configured."
 msgstr "Aucun programme GPG/PGP configur�."
 
-#: mail/mail-format.c:1327
+#: mail/mail-format.c:1373
 msgid "Encrypted message not displayed"
 msgstr "Message crypt� non affich�"
 
-#: mail/mail-format.c:1338
+#: mail/mail-format.c:1384
 msgid "Encrypted message"
 msgstr "Message crypt�"
 
-#: mail/mail-format.c:1339
+#: mail/mail-format.c:1385
 msgid "Click icon to decrypt."
 msgstr "Cliquez sur l'icone pour d�crypter"
 
-#: mail/mail-format.c:1394
+#: mail/mail-format.c:1440
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Ce message est sign� digitalement et a �t� certifi� authentique."
 
-#: mail/mail-format.c:1405
+#: mail/mail-format.c:1451
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "Ce message est sign� digitalement mais ne peut �tre certifi� authentique."
 
-#: mail/mail-format.c:2083
+#: mail/mail-format.c:2128
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pointeur sur le site FTP (%s)"
 
-#: mail/mail-format.c:2097
+#: mail/mail-format.c:2142
 #, 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:2102
+#: mail/mail-format.c:2147
 #, fuzzy, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pointeur sur le fichier local (%s)"
 
-#: mail/mail-format.c:2131
+#: mail/mail-format.c:2176
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Pointeur sur des donn�es distantes (%s)"
 
-#: mail/mail-format.c:2139
+#: mail/mail-format.c:2184
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pointeur sur des donn�es externes inconnues (� %s � type)"
 
-#: mail/mail-format.c:2144
+#: mail/mail-format.c:2189
 msgid "Malformed external-body part."
 msgstr "Partie corps externe malform�e"
 
-#: mail/mail-local.c:547
+#: mail/mail-local.c:563
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "Rafraichissement du dossier"
 
-#: mail/mail-local.c:620
+#: mail/mail-local.c:636
 #, fuzzy, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -9361,29 +9494,29 @@ msgstr ""
 "Ne peut enregistrer les meta-info du dossier; vous n'allez probablement plus "
 "pouvoir ouvrir ce dossier : %s"
 
-#: mail/mail-local.c:676
+#: mail/mail-local.c:689
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Ne peut obtenir le r�pertoire : %s : %s"
 
-#: mail/mail-local.c:722
+#: mail/mail-local.c:735
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 "Ne peut supprimer le dossier :\n"
 "� %s �"
 
-#: mail/mail-local.c:1052
+#: mail/mail-local.c:1075
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Changement du dossier � %s � vers le format � %s �"
 
-#: mail/mail-local.c:1067
+#: mail/mail-local.c:1090
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1089
+#: mail/mail-local.c:1112
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -9391,13 +9524,13 @@ 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:1180
+#: mail/mail-local.c:1200
 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:1190
-#, c-format
-msgid "Reconfigure %s"
+#: mail/mail-local.c:1209
+#, fuzzy, c-format
+msgid "Reconfigure /%s"
 msgstr "Reconfigure %s"
 
 #: mail/mail-mt.c:199
@@ -9419,21 +9552,25 @@ msgstr ""
 "%s"
 
 #. Remember the password?
-#: mail/mail-mt.c:482
+#: mail/mail-mt.c:509
 msgid "Remember this password"
 msgstr "Se souvenir du mot de passe"
 
-#: mail/mail-mt.c:539
+#: mail/mail-mt.c:510
+msgid "Remember this password for the remainder of this session"
+msgstr ""
+
+#: mail/mail-mt.c:567
 #, fuzzy, c-format
 msgid "Enter Password for %s"
 msgstr "Entrer le mot de passe de %s"
 
-#: mail/mail-mt.c:542
+#: mail/mail-mt.c:570
 #, fuzzy
 msgid "Enter Password"
 msgstr "Entrer le mot de passe de %s"
 
-#: mail/mail-mt.c:852
+#: mail/mail-mt.c:886
 msgid "Working"
 msgstr "Travail en cours"
 
@@ -9496,6 +9633,11 @@ msgstr "Duplication"
 msgid "Scanning folders in \"%s\""
 msgstr "Scrutation des dossiers dans � %s �"
 
+#. Fill in the new fields
+#: mail/mail-ops.c:1040 shell/e-local-storage.c:179
+msgid "Trash"
+msgstr "Corbeille"
+
 #: mail/mail-ops.c:1173
 msgid "Forwarded messages"
 msgstr "Messages suivis"
@@ -9584,6 +9726,11 @@ msgstr "Ne peut �crire les donn�es : %s"
 msgid "Disconnecting from %s"
 msgstr "D�connexion de %s"
 
+#: mail/mail-ops.c:2065
+#, fuzzy, c-format
+msgid "Reconnecting to %s"
+msgstr "D�connexion de %s"
+
 #: mail/mail-search-dialogue.c:113
 msgid "_Search"
 msgstr "Rechercher"
@@ -9640,12 +9787,12 @@ msgstr ""
 msgid "Type: %s"
 msgstr "Type :"
 
-#: mail/mail-send-recv.c:282
+#: mail/mail-send-recv.c:283
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "Envoyer & Recevoir le courrier"
 
-#: mail/mail-send-recv.c:283
+#: mail/mail-send-recv.c:284
 #, fuzzy
 msgid "Cancel All"
 msgstr "Annuler"
@@ -9666,30 +9813,48 @@ msgstr "Annul�."
 msgid "User canceled operation."
 msgstr "L'utilisateur a annul� la requ�te"
 
-#: mail/mail-tools.c:173
+#: mail/mail-tools.c:133
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Ne peut cr�er de mbox temporaire � %s � : %s"
 
-#: mail/mail-tools.c:299
+#: mail/mail-tools.c:259
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Message suivi - %s"
 
-#: mail/mail-tools.c:303
+#: mail/mail-tools.c:263
 msgid "Forwarded message"
 msgstr "Message suivi"
 
-#: mail/mail-tools.c:439
+#: mail/mail-tools.c:396
 msgid "Forwarded Message"
 msgstr "Message suivi"
 
-#: mail/mail-vfolder.c:161
+#: mail/mail-vfolder.c:84
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Cr�ation du dossier %s"
 
-#: mail/mail-vfolder.c:541
+#: mail/mail-vfolder.c:201
+#, fuzzy, c-format
+msgid "Updating vfolders for uri: %s"
+msgstr "Chargement de %s dossier pour %s"
+
+#: mail/mail-vfolder.c:414
+#, c-format
+msgid ""
+"The following vFolder(s):\n"
+"%sUsed the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+
+#: mail/mail-vfolder.c:636
+msgid "VFolders"
+msgstr "Dossiers virtuels"
+
+#: mail/mail-vfolder.c:742
 msgid "New VFolder"
 msgstr "Nouveau dossier virtuel"
 
@@ -9762,7 +9927,7 @@ msgstr "%a %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2331
+#: mail/message-list.c:2334
 msgid "Generating message list"
 msgstr "Generation d'une liste de messages"
 
@@ -9847,34 +10012,34 @@ msgstr "Se _d�sabonner"
 msgid "Evolution component for the executive summary."
 msgstr "Composant pour le r�sum�"
 
-#: my-evolution/component-factory.c:30
+#: my-evolution/component-factory.c:45
 msgid "Folder containing the Evolution Summary"
 msgstr "Dossier contenant le r�sum� d'Evolution"
 
-#: my-evolution/component-factory.c:139
+#: my-evolution/component-factory.c:154
 #, fuzzy
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr "Ne peut initialiser le composant de r�sum� de messages d'Evolution."
 
-#: my-evolution/e-summary-calendar.c:248 my-evolution/e-summary-calendar.c:266
+#: my-evolution/e-summary-calendar.c:263 my-evolution/e-summary-calendar.c:281
 msgid "Appointments"
 msgstr "Rendez-vous"
 
-#: my-evolution/e-summary-calendar.c:249
+#: my-evolution/e-summary-calendar.c:264
 msgid "No appointments"
 msgstr "Pas de rendez-vous"
 
-#: my-evolution/e-summary-calendar.c:286
+#: my-evolution/e-summary-calendar.c:301
 #, fuzzy
 msgid "%k%M %d %B"
 msgstr "%A %d %B"
 
-#: my-evolution/e-summary-calendar.c:288
+#: my-evolution/e-summary-calendar.c:303
 #, fuzzy
 msgid "%l:%M %d %B"
 msgstr "%A %d %B"
 
-#: my-evolution/e-summary-mail.c:115
+#: my-evolution/e-summary-mail.c:130
 msgid "Mail summary"
 msgstr "R�sum� de courrier"
 
@@ -9882,83 +10047,83 @@ msgstr "R�sum� de courrier"
 #. see in My Evolution by default. You can find the list of all
 #. stations and their codes in Evolution sources
 #. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-preferences.c:65
-#: my-evolution/e-summary-weather.c:615
+#: my-evolution/e-summary-preferences.c:80
+#: my-evolution/e-summary-weather.c:630
 msgid "KBOS:ZSAM:EGAA"
 msgstr "KBOS:ZSAM:EGAA"
 
-#: my-evolution/e-summary-preferences.c:427
+#: my-evolution/e-summary-preferences.c:441
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionnary.com du jour"
 
-#: my-evolution/e-summary-preferences.c:449
+#: my-evolution/e-summary-preferences.c:463
 msgid "Quotes of the Day"
 msgstr "Citations du jour"
 
-#: my-evolution/e-summary-preferences.c:890
+#: my-evolution/e-summary-preferences.c:929
 msgid "Add a news feed"
 msgstr "Ajouter un serveur de news"
 
-#: my-evolution/e-summary-preferences.c:898
+#: my-evolution/e-summary-preferences.c:937
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Entrez l'URL du serveur de news que vous voulez ajouter"
 
-#: my-evolution/e-summary-preferences.c:902
+#: my-evolution/e-summary-preferences.c:941
 msgid "Name:"
 msgstr "Nom :"
 
-#: my-evolution/e-summary-preferences.c:1438
+#: my-evolution/e-summary-preferences.c:1486
 msgid "Summary Settings"
 msgstr "_R�glages r�sum�"
 
-#: my-evolution/e-summary-rdf.c:277 my-evolution/e-summary-rdf.c:362
-#: my-evolution/e-summary-rdf.c:395
+#: my-evolution/e-summary-rdf.c:297 my-evolution/e-summary-rdf.c:382
+#: my-evolution/e-summary-rdf.c:415
 #, fuzzy
 msgid "Error downloading RDF"
 msgstr "<b>Erreur lors du  chargement RDF</b>"
 
-#: my-evolution/e-summary-rdf.c:487
+#: my-evolution/e-summary-rdf.c:507
 msgid "News Feed"
 msgstr "Serveur de forums"
 
-#: my-evolution/e-summary-tasks.c:216
+#: my-evolution/e-summary-tasks.c:238
 msgid "No tasks"
 msgstr "Aucune t�che"
 
-#: my-evolution/e-summary-tasks.c:255
+#: my-evolution/e-summary-tasks.c:277
 #, fuzzy
 msgid "(No Description)"
 msgstr "(Aucune description)"
 
-#: my-evolution/e-summary-weather.c:57
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr "Ma M�t�o"
 
-#: my-evolution/e-summary-weather.c:334
+#: my-evolution/e-summary-weather.c:349
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr "<dd><b>Le serveur de m�t�o ne peut �tre contact�</b></dd>"
 
-#: my-evolution/e-summary-weather.c:524
+#: my-evolution/e-summary-weather.c:539
 msgid "Weather"
 msgstr "M�t�o"
 
-#: my-evolution/e-summary-weather.c:676
+#: my-evolution/e-summary-weather.c:691
 msgid "Regions"
 msgstr "R�gions"
 
-#: my-evolution/e-summary.c:162
+#: my-evolution/e-summary.c:187
 msgid "%A, %B %e %Y"
 msgstr "%A %d %B %Y"
 
-#: my-evolution/e-summary.c:512 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:568 ui/my-evolution.xml.h:3
 msgid "Print Summary"
 msgstr "Imprimer le r�sum�"
 
-#: my-evolution/e-summary.c:558
+#: my-evolution/e-summary.c:614
 msgid "Printing of Summary failed"
 msgstr "�chec de l'impression du r�sum�"
 
-#: my-evolution/main.c:52
+#: my-evolution/main.c:67
 #, fuzzy
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Ne peut initialiser Bonobo.\n"
@@ -11466,6 +11631,18 @@ msgstr "Montrer les d�tails"
 msgid "Cancel Operation"
 msgstr "Annuler l'op�ration"
 
+#: shell/e-local-storage.c:175 shell/e-shortcuts.c:1053
+msgid "Inbox"
+msgstr "Inbox"
+
+#: shell/e-local-storage.c:176
+msgid "Outbox"
+msgstr "Outbox"
+
+#: shell/e-local-storage.c:624
+msgid "Local Folders"
+msgstr "Dossiers locaux"
+
 #: shell/e-setup.c:125
 msgid "Evolution installation"
 msgstr "Installation d'Evolution"
@@ -11544,37 +11721,37 @@ msgstr ""
 "d'Evolution. D�placez le afin de permettre\n"
 "l'installation des fichiers utilisateur d'Evolution."
 
-#: shell/e-shell-folder-commands.c:174
+#: shell/e-shell-folder-commands.c:176
 msgid "Cannot move a folder over itself."
 msgstr "Ne peut d�placer un r�pertoire sur lui m�me."
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:178
 msgid "Cannot copy a folder over itself."
 msgstr "Ne peut copier un dossier sur lui m�me."
 
-#: shell/e-shell-folder-commands.c:190
+#: shell/e-shell-folder-commands.c:192
 msgid "Cannot move a folder into one of its descendants."
 msgstr "Ne peut d�placer un r�pertoire sur un de ses descendant."
 
-#: shell/e-shell-folder-commands.c:294
+#: shell/e-shell-folder-commands.c:312
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "Sp�cifier un dossier pour y copier le dossier  � %s � :"
 
-#: shell/e-shell-folder-commands.c:299
+#: shell/e-shell-folder-commands.c:317
 msgid "Copy folder"
 msgstr "Copier le dossier"
 
-#: shell/e-shell-folder-commands.c:337
+#: shell/e-shell-folder-commands.c:359
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "Sp�cifier un dossier pour y d�placer le dossier  � %s � :"
 
-#: shell/e-shell-folder-commands.c:342
+#: shell/e-shell-folder-commands.c:364
 msgid "Move folder"
 msgstr "D�placer le dossier"
 
-#: shell/e-shell-folder-commands.c:367
+#: shell/e-shell-folder-commands.c:390
 #, fuzzy, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -11583,33 +11760,35 @@ msgstr ""
 "Ne peut supprimer le dossier :\n"
 "� %s �"
 
-#: shell/e-shell-folder-commands.c:383
+#: shell/e-shell-folder-commands.c:406
 #, fuzzy, c-format
-msgid "Delete folder '%s'"
-msgstr "Supprimer le dossier  � %s �"
+msgid "Delete \"%s\""
+msgstr "Supprimer"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:393
+#: shell/e-shell-folder-commands.c:416
 #, fuzzy, c-format
-msgid "Are you sure you want to remove the '%s' folder?"
+msgid "Are you sure you want to remove the \"%s\" folder?"
 msgstr "�tes-vous s�r de vouloir supprimer le dossier � %s � ?"
 
-#. Popup a dialog asking what the user would like to rename
-#. the folder to
-#: shell/e-shell-folder-commands.c:468
+#: shell/e-shell-folder-commands.c:470
 #, fuzzy, c-format
-msgid "Rename folder '%s'"
-msgstr "Renommer le dossier  � %s �"
+msgid ""
+"Cannot rename folder:\n"
+"%s"
+msgstr ""
+"Ne peut supprimer le dossier :\n"
+"� %s �"
 
-#: shell/e-shell-folder-commands.c:472
-msgid "Rename"
-msgstr "Renommer"
+#: shell/e-shell-folder-commands.c:503
+#, fuzzy, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "Renommer le dossier  � %s �"
 
-#. Make, pack the label
-#: shell/e-shell-folder-commands.c:480
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "Nom du dossier : "
+#: shell/e-shell-folder-commands.c:506
+#, fuzzy
+msgid "Rename folder"
+msgstr "Renommer le dossier  � %s �"
 
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
@@ -11645,7 +11824,7 @@ msgstr "Le nom de dossier sp�cifi� n'est pas valide."
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Cr�ez un nouveau dossier"
 
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:99
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -11653,7 +11832,7 @@ msgstr ""
 "Le type du dossier s�lectionn� n'est pas valide pour\n"
 "l'op�ration demand�e."
 
-#: shell/e-shell-folder-selection-dialog.c:348
+#: shell/e-shell-folder-selection-dialog.c:360
 msgid "New..."
 msgstr "Nouveau..."
 
@@ -11661,7 +11840,11 @@ msgstr "Nouveau..."
 msgid "(Untitled)"
 msgstr "(Sans titre)"
 
-#: shell/e-shell-importer.c:102
+#: shell/e-shell-importer.c:141
+msgid "Choose the type of importer to run"
+msgstr ""
+
+#: shell/e-shell-importer.c:144
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -11675,9 +11858,16 @@ msgstr ""
 "Vous pouvez s�lectionner �Automatique� si vous l'ignorez, et Evolution "
 "essaiera de lutiliser."
 
+#: shell/e-shell-importer.c:150
+#, fuzzy
+msgid "Please select the information that you would like to import"
+msgstr ""
+"S�lectionnez les informations\n"
+"que vous d�sirez importer S.V.P"
+
 #. Importer isn't ready yet.
 #. Wait 5 seconds and try again.
-#: shell/e-shell-importer.c:197
+#: shell/e-shell-importer.c:242
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11688,7 +11878,7 @@ msgstr ""
 "L'importateur n'est pas pr�t.\n"
 "Attente de 5 secondes avant un nouvel essai."
 
-#: shell/e-shell-importer.c:217 shell/e-shell-importer.c:248
+#: shell/e-shell-importer.c:262 shell/e-shell-importer.c:293
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11697,27 +11887,27 @@ msgstr ""
 "Importation %s\n"
 "Importation �l�ment %d."
 
-#: shell/e-shell-importer.c:351
+#: shell/e-shell-importer.c:396
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "Le dossier � %s � n'existe pas."
 
-#: shell/e-shell-importer.c:363
+#: shell/e-shell-importer.c:408
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:378
+#: shell/e-shell-importer.c:423
 #, fuzzy, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr "Il n'y a pas d' importateur capable de s'occuper de/n%s."
 
-#: shell/e-shell-importer.c:388
+#: shell/e-shell-importer.c:433
 msgid "Importing"
 msgstr "Importation"
 
-#: shell/e-shell-importer.c:396
+#: shell/e-shell-importer.c:441
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -11726,17 +11916,17 @@ msgstr ""
 "Importation %s.\n"
 "Lancement %s"
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:454
 #, fuzzy, c-format
 msgid "Error starting %s"
 msgstr "Erreur de lancement %s"
 
-#: shell/e-shell-importer.c:428
+#: shell/e-shell-importer.c:473
 #, c-format
 msgid "Error loading %s"
 msgstr "Erreur de chargement %s"
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:490
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11745,31 +11935,57 @@ msgstr ""
 "Importation %s\n"
 "Importation �l�ment 1."
 
-#: shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:560
 msgid "Automatic"
 msgstr "Automatique"
 
-#: shell/e-shell-importer.c:566
+#: shell/e-shell-importer.c:611
 msgid "Filename:"
 msgstr "Nom du fichier :"
 
-#: shell/e-shell-importer.c:571
+#: shell/e-shell-importer.c:616
 msgid "Select a file"
 msgstr "S�lectionner un fichier"
 
-#: shell/e-shell-importer.c:581
+#: shell/e-shell-importer.c:626
 msgid "File type:"
 msgstr "Type de fichier :"
 
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:651
+msgid "Import data and settings from older programs"
+msgstr ""
+
+#: shell/e-shell-importer.c:655
+#, fuzzy
+msgid "Import a single file"
+msgstr "Importer un format de fichier externe"
+
+#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:582
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+"Attendez S.V.P...\n"
+"Recherche des param�trages existants"
+
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:585
+msgid "Starting Intelligent Importers"
+msgstr "Importateurs intelligents de d�marrage"
+
+#: shell/e-shell-importer.c:840 shell/e-shell-startup-wizard.c:703
+#, fuzzy, c-format
+msgid "From %s:"
+msgstr "De :"
+
+#: shell/e-shell-importer.c:1003
 msgid "Select folder"
 msgstr "S�lectionnez un Dossier"
 
-#: shell/e-shell-importer.c:646
+#: shell/e-shell-importer.c:1004
 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:689 shell/importer/intelligent.c:194
+#: shell/e-shell-importer.c:1116 shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "Importer"
 
@@ -11790,23 +12006,6 @@ msgstr ""
 msgid "Cannot initialize the Evolution Mailer Wizard interface"
 msgstr "Ne peut initialiser l'interface Wizard de messagerie d'Evolution"
 
-#: shell/e-shell-startup-wizard.c:582
-msgid ""
-"Please wait...\n"
-"Scanning for existing setups"
-msgstr ""
-"Attendez S.V.P...\n"
-"Recherche des param�trages existants"
-
-#: shell/e-shell-startup-wizard.c:585
-msgid "Starting Intelligent Importers"
-msgstr "Importateurs intelligents de d�marrage"
-
-#: shell/e-shell-startup-wizard.c:703
-#, fuzzy, c-format
-msgid "From %s:"
-msgstr "De :"
-
 #: shell/e-shell-startup-wizard.c:745
 msgid ""
 "Please select the information\n"
@@ -11815,24 +12014,24 @@ msgstr ""
 "S�lectionnez les informations\n"
 "que vous d�sirez importer S.V.P"
 
-#: shell/e-shell-view-menu.c:183
+#: shell/e-shell-view-menu.c:201
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy n'a pas �t� trouv� dans votre $PATH."
 
-#: shell/e-shell-view-menu.c:191
+#: shell/e-shell-view-menu.c:209
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy ne peut �tre ex�cut�."
 
-#: shell/e-shell-view-menu.c:217
+#: shell/e-shell-view-menu.c:235
 #, fuzzy
 msgid "Ximian Evolution"
 msgstr "Evolution"
 
-#: shell/e-shell-view-menu.c:219
+#: shell/e-shell-view-menu.c:237
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:221
+#: shell/e-shell-view-menu.c:239
 #, fuzzy
 msgid ""
 "Ximian Evolution is a suite of groupware applications\n"
@@ -11843,27 +12042,36 @@ msgstr ""
 "pour la messagerie, l'agenda, et la gestion de contacts\n"
 "� l'int�rieur de l'environnement de bureau Gnome."
 
-#: shell/e-shell-view-menu.c:424
+#: shell/e-shell-view-menu.c:442
 msgid "Go to folder..."
 msgstr "Aller au dossier..."
 
-#: shell/e-shell-view-menu.c:425
+#: shell/e-shell-view-menu.c:443
 msgid "Select the folder that you want to open"
 msgstr "S�lectionnez le dossier que vous voulez ouvrir"
 
-#: shell/e-shell-view-menu.c:570
+#: shell/e-shell-view-menu.c:563
 msgid "Create a new shortcut"
 msgstr "Cr�er un nouveau raccourci"
 
-#: shell/e-shell-view-menu.c:571
+#: shell/e-shell-view-menu.c:564
 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:685
+#: shell/e-shell-view-menu.c:595
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:603
+#, fuzzy, c-format
+msgid "Error executing %s."
+msgstr "Erreur ex�cution du filtre : %s : %s"
+
+#: shell/e-shell-view-menu.c:705
 msgid "Work Online"
 msgstr "Travail En ligne"
 
-#: shell/e-shell-view-menu.c:698 shell/e-shell-view-menu.c:711
+#: shell/e-shell-view-menu.c:718 shell/e-shell-view-menu.c:731
 #: ui/evolution.xml.h:30
 msgid "Work Offline"
 msgstr "Travail _Hors ligne"
@@ -11872,51 +12080,51 @@ msgstr "Travail _Hors ligne"
 msgid "(No folder displayed)"
 msgstr "(Aucun dossier affich�)"
 
-#: shell/e-shell-view.c:1478
+#: shell/e-shell-view.c:1512
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1480
+#: shell/e-shell-view.c:1514
 #, fuzzy
 msgid "(None)"
 msgstr "(Inconnu)"
 
-#: shell/e-shell-view.c:1485
+#: shell/e-shell-view.c:1519
 #, fuzzy, c-format
 msgid "%s - Ximian Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1487
+#: shell/e-shell-view.c:1521
 #, fuzzy, c-format
 msgid "%s - Ximian Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell-view.c:1527
+#: shell/e-shell-view.c:1561
 #, fuzzy
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Evolution est en ligne. Cliquez sur ce bouton pour tavailler hors ligne."
 
-#: shell/e-shell-view.c:1534
+#: shell/e-shell-view.c:1568
 #, fuzzy
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Evloution va travailler hors ligne."
 
-#: shell/e-shell-view.c:1540
+#: shell/e-shell-view.c:1574
 #, fuzzy
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Evolution est hors ligne. Cliquez sur ce bouton pour tavailler en ligne."
 
-#: shell/e-shell.c:560
+#: shell/e-shell.c:562
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Ne peut param�trer le stockage local -- %s"
 
-#: shell/e-shell.c:1496
+#: shell/e-shell.c:1488
 #, c-format
 msgid ""
 "Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
@@ -11925,25 +12133,25 @@ msgstr ""
 "Ouups !  Les vues pour � %s � sont mortes de mani�re inattendue.  :-(\n"
 "Cela signifie probablement que le composant %s a plant�."
 
-#: shell/e-shell.c:1700 widgets/misc/e-cell-date-edit.c:248
+#: shell/e-shell.c:1692 widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "OK"
 
-#: shell/e-shell.c:1702
+#: shell/e-shell.c:1694
 msgid "Invalid arguments"
 msgstr "Arguments invalides"
 
-#: shell/e-shell.c:1704
+#: shell/e-shell.c:1696
 #, fuzzy
 msgid "Cannot register on OAF"
 msgstr "Ne peut enregistrer sur OAF"
 
-#: shell/e-shell.c:1706
+#: shell/e-shell.c:1698
 #, fuzzy
 msgid "Configuration Database not found"
 msgstr "Base de donn�es de configuration non trouv�e"
 
-#: shell/e-shell.c:1708 shell/e-storage.c:491
+#: shell/e-shell.c:1700 shell/e-storage.c:496
 msgid "Generic error"
 msgstr "Erreur g�n�rique"
 
@@ -12068,55 +12276,60 @@ msgstr "Erreur lors de l'enregistrement des raccourcis."
 msgid "Shortcuts"
 msgstr "Raccourcis"
 
-#: shell/e-shortcuts.c:1053
-msgid "Inbox"
-msgstr "Inbox"
+#: shell/e-storage-set-view.c:645
+#, fuzzy, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr ""
+"Ne peut supprimer le dossier :\n"
+"� %s �"
 
 #: shell/e-storage.c:182 shell/e-storage.c:188
 msgid "(No name)"
 msgstr "(Pas de nom)"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:494
 msgid "No error"
 msgstr "Pas d'erreur"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:498
 msgid "A folder with the same name already exists"
 msgstr "Un dossier avec le m�me nom existe d�j�"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:500
 msgid "The specified folder type is not valid"
 msgstr "Le type de dossier sp�cifi� n'est pas valide"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:502
 msgid "I/O error"
 msgstr "Erreur d'E/S"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:504
 msgid "Not enough space to create the folder"
 msgstr "Pas suffisamment d'espace pour cr�er le dossier"
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:506
 msgid "The specified folder was not found"
 msgstr "Le dossier sp�cifi� n'a pas �t� trouv�"
 
-#: shell/e-storage.c:503
+#: shell/e-storage.c:508
 msgid "Function not implemented in this storage"
 msgstr "La fonction n'est pas impl�ment� dans ce stockage"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:512
 msgid "Operation not supported"
 msgstr "Op�ration non support�e"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:514
 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:511
+#: shell/e-storage.c:516
 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:513
+#: shell/e-storage.c:518
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Ne peut faire un dossier un enfant de ses descendants"
 
@@ -12147,6 +12360,10 @@ msgstr "H�te :"
 msgid "The following connections are currently active:"
 msgstr "Les connexions suivantes sont actives :"
 
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr "Nom du dossier : "
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder type:"
 msgstr "Type de dossier :"
@@ -12198,14 +12415,26 @@ msgid "Evolution Importer Assistant"
 msgstr "Assistant d'importation"
 
 #: shell/importer/import.glade.h:4
-msgid "Import File (Step 2 of 2)"
+#, fuzzy
+msgid "Import File (step 3 of 3)"
 msgstr "Importez un fichier (�tape 2 de 2)"
 
 #: shell/importer/import.glade.h:5
-msgid "Select a File (step 1 of 2)"
-msgstr "S�lectionnez un fichier (�tape 1 de 2)"
+#, fuzzy
+msgid "Importer Type (step 1 of 3)"
+msgstr "Importez un fichier (�tape 2 de 2)"
 
 #: shell/importer/import.glade.h:6
+#, fuzzy
+msgid "Select Importers (step 2 of 3)"
+msgstr "S�lectionnez un fichier (�tape 1 de 2)"
+
+#: shell/importer/import.glade.h:7
+#, fuzzy
+msgid "Select a File (step 2 of 3)"
+msgstr "S�lectionnez un fichier (�tape 1 de 2)"
+
+#: shell/importer/import.glade.h:8
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of\n"
@@ -12426,13 +12655,6 @@ msgstr "_Rechercher des contacts"
 msgid "_Select All"
 msgstr "_S�lectionner tout"
 
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:44
-#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
-#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:19
-#: ui/my-evolution.xml.h:9
-msgid "_Tools"
-msgstr "_Outils"
-
 #: ui/evolution-calendar.xml.h:2
 msgid "Configure the calendar's settings"
 msgstr "Configurer le param�trage du calendrier"
@@ -12605,8 +12827,8 @@ 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:49
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:36
 msgid "_File"
 msgstr "_Fichier"
@@ -12627,8 +12849,8 @@ msgstr "Enregistrer le contact et fermer la bo�te de dialogue"
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:54
-#: ui/evolution-signature-editor.xml.h:11
+#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Save"
 msgstr "_Enregistrer"
 
@@ -13221,6 +13443,11 @@ msgstr "Affichage _Normal"
 msgid "_Open Message"
 msgstr "_Ouvrir le message"
 
+#: ui/evolution-mail-message.xml.h:98 ui/evolution.xml.h:49
+#: ui/my-evolution.xml.h:9
+msgid "_Tools"
+msgstr "_Outils"
+
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Fermer cette fenetre"
@@ -13232,8 +13459,8 @@ msgstr "Fermer cette fenetre"
 msgid "_Close"
 msgstr "_Fermer"
 
-#: ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:48
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:50
 msgid "_View"
 msgstr "_Vue"
 
@@ -13398,36 +13625,31 @@ msgid "_Cc Field"
 msgstr "Champ _Cc"
 
 #: ui/evolution-message-composer.xml.h:46
-#: ui/evolution-signature-editor.xml.h:6
-msgid "_Debug"
-msgstr "_D�boguer"
-
-#: ui/evolution-message-composer.xml.h:47
 msgid "_Delete all"
 msgstr "_Supprimer tout"
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:49
 msgid "_From Field"
 msgstr "Champ _From"
 
-#: ui/evolution-message-composer.xml.h:51
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-signature-editor.xml.h:9
 msgid "_Insert"
 msgstr "_Ins�rer"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:51
 msgid "_Open..."
 msgstr "_Ouvrir..."
 
-#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Reply-To Field"
 msgstr "Champ _R�pondre �"
 
-#: ui/evolution-message-composer.xml.h:55
+#: ui/evolution-message-composer.xml.h:54
 msgid "_Security"
 msgstr "_S�curit�"
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "A_ide"
 
@@ -13563,8 +13785,8 @@ msgid "Exit the program"
 msgstr "Quitte le programme"
 
 #: ui/evolution.xml.h:15
-msgid "Import an external file format"
-msgstr "Importer un format de fichier externe"
+msgid "Import data from other programs"
+msgstr ""
 
 #: ui/evolution.xml.h:17
 msgid "Move this folder to another place"
@@ -13638,8 +13860,9 @@ msgid "_Go to Folder..."
 msgstr "_Aller au dossier..."
 
 #: ui/evolution.xml.h:41
-msgid "_Import File..."
-msgstr "_Importer un fichier..."
+#, fuzzy
+msgid "_Import..."
+msgstr "Importation"
 
 #: ui/evolution.xml.h:42
 msgid "_Move..."
@@ -13654,18 +13877,23 @@ msgid "_New Folder"
 msgstr "_Nouveau dossier"
 
 #: ui/evolution.xml.h:45
+#, fuzzy
+msgid "_Pilot Settings..."
+msgstr "Param�trage de la messagerie..."
+
+#: ui/evolution.xml.h:46
 msgid "_Rename..."
 msgstr "_Renommer..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:47
 msgid "_Shortcut"
 msgstr "Raccourci"
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:48
 msgid "_Shortcut Bar"
 msgstr "Barre de _raccourcis"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:51
 msgid "_Work Offline"
 msgstr "Travail _Hors ligne"
 
@@ -13762,11 +13990,11 @@ msgstr "LMMJVSD"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:433
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:439
 msgid "Now"
 msgstr "Maintenant"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:445
 msgid "Today"
 msgstr "Aujourd'hui"
 
@@ -13912,18 +14140,62 @@ 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:175
+#: wombat/wombat.c:176
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs() : Ne peut initialiser GNOME-VFS"
 
-#: wombat/wombat.c:187
+#: wombat/wombat.c:188
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba() : Ne peut initialiser GNOME"
 
-#: wombat/wombat.c:200
+#: wombat/wombat.c:201
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo() : Ne peut initialiser Bonobo"
 
+#, fuzzy
+#~ msgid "_Calendar Information:"
+#~ msgstr "Information calendrier"
+
+#~ msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
+#~ msgstr ""
+#~ "La priorit� doit �tre � Haute �, � Normale �, � Basse � ou � Ind�finie �."
+
+#~ msgid "before start of appointment"
+#~ msgstr "Avant le d�but du  rendez-vous"
+
+#~ msgid "after start of appointment"
+#~ msgstr "Apr�s le d�but du rendez-vous"
+
+#~ msgid "before end of appointment"
+#~ msgstr "Avant la fin du rendez-vous"
+
+#~ msgid "Each account must have a different name."
+#~ msgstr "Chaque compte doit avoir un nom diff�rent."
+
+#~ msgid "Message _preview should be displayed by default"
+#~ msgstr "L'_aper�u du message devrait �tre affich� par d�faut"
+
+#~ msgid "Message list should display in a _threaded fashion by default"
+#~ msgstr ""
+#~ "La liste des messages devrait �tre affich�e par _Fil de discussion par "
+#~ "d�faut"
+
+#~ msgid "_Remember PGP Passphrase until exit"
+#~ msgstr "Se rappeler de la  �Passphrase� jusqu'� la sortie"
+
+#, fuzzy
+#~ msgid "Delete folder '%s'"
+#~ msgstr "Supprimer le dossier  � %s �"
+
+#~ msgid "Rename"
+#~ msgstr "Renommer"
+
+#~ msgid "_Debug"
+#~ msgstr "_D�boguer"
+
+#~ msgid "_Import File..."
+#~ msgstr "_Importer un fichier..."
+
 #~ msgid "Unable to get local storage.  This should never happen."
 #~ msgstr ""
 #~ "Impossibilit� d'obtenir un stockage local. Ceci ne devrait jamais arriver."
@@ -14007,10 +14279,6 @@ msgstr "init_bonobo() : Ne peut initialiser Bonobo"
 #~ msgid "%x"
 #~ msgstr "%x"
 
-#, fuzzy
-#~ msgid "%s: Inbox"
-#~ msgstr "%s : Inbox"
-
 #~ msgid "No such folder /%s"
 #~ msgstr "Aucun dossier � %s �."
 
@@ -14135,9 +14403,6 @@ msgstr "init_bonobo() : Ne peut initialiser Bonobo"
 #~ msgid "Forwarded message:\n"
 #~ msgstr "Message suivi :\n"
 
-#~ msgid "Trash"
-#~ msgstr "Corbeille"
-
 #~ msgid "Synchronizing '%s'"
 #~ msgstr "Synchronisation de � %s �"
 
@@ -14154,18 +14419,6 @@ msgstr "init_bonobo() : Ne peut initialiser Bonobo"
 #~ msgid "_Refresh time (seconds):"
 #~ msgstr "_Rafra�chir l'heure"
 
-#~ msgid "Other Contacts"
-#~ msgstr "Autres contacts"
-
-#~ msgid "VFolders"
-#~ msgstr "Dossiers virtuels"
-
-#~ msgid "Outbox"
-#~ msgstr "Outbox"
-
-#~ msgid "Local Folders"
-#~ msgstr "Dossiers locaux"
-
 #~ msgid "IMAPv4"
 #~ msgstr "IMAPv4"
 
@@ -15053,10 +15306,6 @@ msgstr "init_bonobo() : Ne peut initialiser Bonobo"
 #~ msgstr "Avanc�..."
 
 #, fuzzy
-#~ msgid "Click here to add a contact"
-#~ msgstr "* Cliquez ici pour ajouter un contact *"
-
-#, fuzzy
 #~ msgid ""
 #~ "This option will connect to the server using a the PLAIN SASL mechanism "
 #~ "if the server supports it."
@@ -15348,9 +15597,6 @@ msgstr "init_bonobo() : Ne peut initialiser Bonobo"
 #~ msgid "Copy messages from \"%s\" into \"%s\""
 #~ msgstr "Copie les messages de � %s � vers � %s �"
 
-#~ msgid "Loading %s Folder for %s"
-#~ msgstr "Chargement de %s dossier pour %s"
-
 #~ msgid "Load %s Folder for %s"
 #~ msgstr "Charge %s dossier pour %s"
 
diff --git a/po/ga.po b/po/ga.po
index 3ce5131b9b..fe4244af0d 100755
--- a/po/ga.po
+++ b/po/ga.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.13.99\n"
-"POT-Creation-Date: 2001-09-21 18:31-0400\n"
+"POT-Creation-Date: 2001-10-01 19:06-0400\n"
 "PO-Revision-Date: 2000-08-02 13:00:00-0000\n"
 "Last-Translator: Alastair McKinstry <mckinstry@computer.org>\n"
 "Language-Team: Irish <ga@li.org <mailto:ga@li.org>\n"
@@ -31,286 +31,286 @@ msgid "Name"
 msgstr "Ainm"
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#, fuzzy
-msgid "Family Name"
-msgstr "Ainm Chomad:"
-
-#: addressbook/backend/ebook/e-card-simple.c:61
 #: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Email"
 msgstr "R-Post"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:61
 #: addressbook/gui/contact-editor/e-contact-editor.c:1609
 #, fuzzy
 msgid "Primary"
 msgstr "Tosa�ocht"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:61
 #, fuzzy
 msgid "Prim"
 msgstr "Tosa�ocht"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:92
 #: addressbook/gui/contact-editor/e-contact-editor.c:1594
 #: addressbook/gui/widgets/e-addressbook-view.c:902
 msgid "Assistant"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/gui/contact-editor/e-contact-editor.c:1595
 #: addressbook/gui/contact-editor/e-contact-editor.c:1662
 msgid "Business"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/backend/ebook/e-card-simple.c:68
 msgid "Bus"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/gui/contact-editor/e-contact-editor.c:1598
 msgid "Callback"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/gui/contact-editor/e-contact-editor.c:1600
 msgid "Company"
 msgstr "Teoranta"
 
-#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:65
 #, fuzzy
 msgid "Comp"
 msgstr "Greamaigh"
 
-#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:69
 #: addressbook/gui/contact-editor/e-contact-editor.c:1601
 #: addressbook/gui/contact-editor/e-contact-editor.c:1663
 msgid "Home"
 msgstr "Baile"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:67
 #: addressbook/gui/widgets/e-addressbook-view.c:877
 msgid "Organization"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:67
 msgid "Org"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/e-contact-editor.c:1605
 msgid "Mobile"
 msgstr "Guth�n P�ca"
 
-#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/e-contact-editor.c:1599
 msgid "Car"
 msgstr "Car"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/e-contact-editor.c:1597
 #: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "Business Fax"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/backend/ebook/e-card-simple.c:72
 msgid "Bus Fax"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/backend/ebook/e-card-simple.c:73
 #: addressbook/gui/contact-editor/e-contact-editor.c:1603
 #: addressbook/gui/widgets/e-addressbook-view.c:883
 msgid "Home Fax"
 msgstr "Facs Bhaile"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/e-contact-editor.c:1596
 msgid "Business 2"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/backend/ebook/e-card-simple.c:74
 msgid "Bus 2"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/backend/ebook/e-card-simple.c:75
 #: addressbook/gui/contact-editor/e-contact-editor.c:1602
 msgid "Home 2"
 msgstr "Baile 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/backend/ebook/e-card-simple.c:76
 #: addressbook/gui/contact-editor/e-contact-editor.c:1604
 #: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/backend/ebook/e-card-simple.c:83
 #: addressbook/gui/contact-editor/e-contact-editor.c:1606
 #: addressbook/gui/contact-editor/e-contact-editor.c:1664
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:52
 msgid "Other"
 msgstr "Eile"
 
-#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/backend/ebook/e-card-simple.c:78
 #: addressbook/gui/contact-editor/e-contact-editor.c:1607
 #: addressbook/gui/widgets/e-addressbook-view.c:888
 msgid "Other Fax"
 msgstr "Facs Eile"
 
-#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/gui/contact-editor/e-contact-editor.c:1608
 #: addressbook/gui/widgets/e-addressbook-view.c:889
 msgid "Pager"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/backend/ebook/e-card-simple.c:80
 #: addressbook/gui/contact-editor/e-contact-editor.c:1610
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 msgid "Radio"
 msgstr "Raidio"
 
-#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/backend/ebook/e-card-simple.c:81
 #: addressbook/gui/contact-editor/e-contact-editor.c:1611
 #: addressbook/gui/widgets/e-addressbook-view.c:891
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/backend/ebook/e-card-simple.c:82
 #: addressbook/gui/widgets/e-addressbook-view.c:892
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/backend/ebook/e-card-simple.c:84
 #: addressbook/gui/component/e-address-popup.c:476
 #: addressbook/gui/contact-editor/e-contact-editor.c:1637
 #: addressbook/gui/widgets/e-addressbook-view.c:894
 msgid "Email 2"
 msgstr "Rphost 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/backend/ebook/e-card-simple.c:85
 #: addressbook/gui/component/e-address-popup.c:486
 #: addressbook/gui/contact-editor/e-contact-editor.c:1638
 #: addressbook/gui/widgets/e-addressbook-view.c:895
 msgid "Email 3"
 msgstr "Rphost 3"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/widgets/e-addressbook-view.c:896
 msgid "Web Site"
 msgstr "Idirl�on"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:86
 msgid "Url"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/widgets/e-addressbook-view.c:897
 msgid "Department"
 msgstr "Roinn"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:87
 msgid "Dep"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/backend/ebook/e-card-simple.c:88
 #: addressbook/gui/widgets/e-addressbook-view.c:898
 msgid "Office"
 msgstr "Oifig"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/backend/ebook/e-card-simple.c:88
 #, fuzzy
 msgid "Off"
 msgstr "Oifig"
 
-#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card-simple.c:89
 #: addressbook/gui/widgets/e-addressbook-view.c:899
 msgid "Title"
 msgstr "Tid�al"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:90
 #: addressbook/gui/widgets/e-addressbook-view.c:900
 msgid "Profession"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Prof"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:91
 #: addressbook/gui/widgets/e-addressbook-view.c:901
 msgid "Manager"
 msgstr "Bainisteoir"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:91
 #, fuzzy
 msgid "Man"
 msgstr "Bealtaine"
 
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:92
 msgid "Ass"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card-simple.c:93
 #: addressbook/gui/widgets/e-addressbook-view.c:903
 msgid "Nickname"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card-simple.c:93
 msgid "Nick"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/backend/ebook/e-card-simple.c:94
 #: addressbook/gui/widgets/e-addressbook-view.c:904
 msgid "Spouse"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card-simple.c:95
 #: addressbook/gui/widgets/e-addressbook-view.c:905
 msgid "Note"
 msgstr "Nota"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:96
 #, fuzzy
 msgid "Calendar URI"
 msgstr "Feilire"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:96
 msgid "CALUri"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:97
 #: addressbook/gui/widgets/e-addressbook-view.c:906
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:97
 msgid "FBUrl"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "Anniversary"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "Anniv"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card-simple.c:99
 #, fuzzy
 msgid "Birth Date"
 msgstr ""
 "\n"
 "Data Breithe: "
 
-#: addressbook/backend/ebook/e-card-simple.c:103
+#: addressbook/backend/ebook/e-card-simple.c:102
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr ""
 
+#: addressbook/backend/ebook/e-card-simple.c:103
+#, fuzzy
+msgid "Family Name"
+msgstr "Ainm Chomad:"
+
 #: addressbook/backend/ebook/e-card.c:3564
 msgid "Card: "
 msgstr "Carta: "
@@ -576,10 +576,10 @@ msgstr "Te�p ag fork: %s"
 #: 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:1119
+#: addressbook/conduit/address-conduit.c:1167
 #: addressbook/gui/component/addressbook-factory.c:48
-#: calendar/conduits/calendar/calendar-conduit.c:1204
-#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/conduits/calendar/calendar-conduit.c:1262
+#: calendar/conduits/todo/todo-conduit.c:1034
 #: calendar/gui/alarm-notify/notify-main.c:78 calendar/gui/main.c:63
 msgid "Could not initialize Bonobo"
 msgstr ""
@@ -641,20 +641,20 @@ msgstr ""
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:681
-#: calendar/conduits/calendar/calendar-conduit.c:778
-#: calendar/conduits/todo/todo-conduit.c:592
+#: addressbook/conduit/address-conduit.c:731
+#: calendar/conduits/calendar/calendar-conduit.c:837
+#: calendar/conduits/todo/todo-conduit.c:609
 msgid "Could not start wombat server"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:682
-#: calendar/conduits/calendar/calendar-conduit.c:779
-#: calendar/conduits/todo/todo-conduit.c:593
+#: addressbook/conduit/address-conduit.c:732
+#: calendar/conduits/calendar/calendar-conduit.c:838
+#: calendar/conduits/todo/todo-conduit.c:610
 msgid "Could not start wombat"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:714
-#: addressbook/conduit/address-conduit.c:717
+#: addressbook/conduit/address-conduit.c:762
+#: addressbook/conduit/address-conduit.c:765
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -699,8 +699,8 @@ msgid "Factory for the sample Addressbook control"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:66
-#: calendar/gui/dialogs/comp-editor-util.c:281
-#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:173
+#: calendar/gui/dialogs/comp-editor-util.c:289
+#: calendar/gui/dialogs/comp-editor-util.c:345 shell/e-local-storage.c:173
 #: shell/e-shortcuts.c:1062
 #, fuzzy
 msgid "Contacts"
@@ -718,22 +718,22 @@ msgstr ""
 msgid "LDAP server containing contact information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:386
+#: addressbook/gui/component/addressbook-component.c:411
 #: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "New Contact"
 msgstr "Scr�os an sceal seo"
 
-#: addressbook/gui/component/addressbook-component.c:386
+#: addressbook/gui/component/addressbook-component.c:411
 #, fuzzy
 msgid "New _Contact"
 msgstr "Scr�os an sceal seo"
 
-#: addressbook/gui/component/addressbook-component.c:387
+#: addressbook/gui/component/addressbook-component.c:412
 msgid "New Contact List"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:387
+#: addressbook/gui/component/addressbook-component.c:412
 msgid "New Contact _List"
 msgstr ""
 
@@ -838,19 +838,19 @@ msgid "_Account name:"
 msgstr "Ainm Grupa:"
 
 #: addressbook/gui/component/addressbook-config.glade.h:22
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: 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:90 my-evolution/my-evolution.glade.h:20
+#: mail/mail-config.glade.h:91 my-evolution/my-evolution.glade.h:20
 msgid "_Add"
 msgstr "_Suimigh"
 
 #: addressbook/gui/component/addressbook-config.glade.h:23
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:95
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:96
 #: ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
 #: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
 msgstr "_Eagar"
@@ -873,36 +873,36 @@ msgstr "Post"
 msgid "Other Contacts"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:393
+#: addressbook/gui/component/addressbook.c:407
 #, c-format
 msgid "Please enter your email address and password for access to %s"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:401
+#: addressbook/gui/component/addressbook.c:415
 msgid "LDAP Authentication"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:412
+#: addressbook/gui/component/addressbook.c:426
 msgid "Email Address:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:425
+#: addressbook/gui/component/addressbook.c:439
 #, fuzzy
 msgid "Password:"
 msgstr "Pasfhocal"
 
-#: addressbook/gui/component/addressbook.c:488
+#: addressbook/gui/component/addressbook.c:502
 msgid "Unable to open addressbook"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:495
+#: addressbook/gui/component/addressbook.c:509
 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:500
+#: addressbook/gui/component/addressbook.c:514
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -910,43 +910,43 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:508
+#: addressbook/gui/component/addressbook.c:522
 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:649
+#: addressbook/gui/component/addressbook.c:663
 #: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:650
+#: addressbook/gui/component/addressbook.c:664
 msgid "Name contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:665
 msgid "Email contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:652
+#: addressbook/gui/component/addressbook.c:666
 #: calendar/gui/cal-search-bar.c:59
 msgid "Category is"
 msgstr ""
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:653 widgets/misc/e-filter-bar.h:97
+#: addressbook/gui/component/addressbook.c:667 widgets/misc/e-filter-bar.h:97
 #: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:883
+#: addressbook/gui/component/addressbook.c:897
 #: calendar/gui/cal-search-bar.c:412
 msgid "Any Category"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:925
+#: addressbook/gui/component/addressbook.c:939
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
@@ -961,7 +961,7 @@ msgid "(none)"
 msgstr "(gan ainm)"
 
 #: addressbook/gui/component/e-address-popup.c:466
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #: addressbook/gui/contact-editor/e-contact-editor.c:1636
 msgid "Primary Email"
 msgstr ""
@@ -1133,121 +1133,127 @@ msgid "Details"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
+msgid "F_ree/Busy URL:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 #, fuzzy
 msgid "File A_s:"
 msgstr "Comhad"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "General"
 msgstr "Gn�th"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+msgid ""
+"If this person publishes free/busy or other calendar information on the "
+"Internet, enter the address\n"
+"of that information here."
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "New phone type"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "No_tes:"
 msgstr "_Nota�:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #, fuzzy
 msgid "Organi_zation:"
 msgstr "Treshu�omh"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "Phone Types"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "Wants to receive _HTML mail"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Address..."
 msgstr "S_eoladh..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "_Assistant's name:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Birthday:"
 msgstr "_Breithl�:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Business"
 msgstr "_Gn�"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#, fuzzy
-msgid "_Calendar Information:"
-msgstr "eolas fheilire"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 #: calendar/gui/dialogs/event-page.glade.h:12
 #: calendar/gui/dialogs/task-page.glade.h:10
 msgid "_Contacts..."
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:834 filter/filter.glade.h:8
-#: mail/folder-browser.c:1371 mail/mail-config.glade.h:94
+#: mail/folder-browser.c:1406 mail/mail-config.glade.h:95
 #: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "_Scr�os"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Department:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#, fuzzy
-msgid "_Free/Busy Information:"
-msgstr "Eolas"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Full Name..."
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Home"
 msgstr "_Baile"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Job title:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Manager's Name:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Mobile"
 msgstr "_Guth�n P�ca"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Nickname:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Office:"
 msgstr "_Oifig:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Profession:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#, fuzzy
+msgid "_Public Calendar URL:"
+msgstr "Feilire"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Spouse:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_This is the mailing address"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Web page address:"
 msgstr ""
 
@@ -2459,7 +2465,7 @@ msgstr "Post"
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
 #: addressbook/gui/widgets/e-addressbook-view.c:691
 #: addressbook/gui/widgets/e-addressbook-view.c:753
-#: addressbook/gui/widgets/e-addressbook-view.c:1373
+#: addressbook/gui/widgets/e-addressbook-view.c:1422
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr ""
@@ -2515,8 +2521,8 @@ msgid "Success"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1710
-#: shell/e-storage.c:515
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1702
+#: shell/e-storage.c:520
 msgid "Unknown error"
 msgstr "iEarraidh gan Aithne"
 
@@ -2524,7 +2530,7 @@ msgstr "iEarraidh gan Aithne"
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:505
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:510
 msgid "Permission denied"
 msgstr ""
 
@@ -2541,10 +2547,10 @@ msgid "Protocol not supported"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:733 calendar/gui/calendar-model.c:1274
+#: calendar/gui/calendar-model.c:726 calendar/gui/calendar-model.c:1247
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:544
-#: camel/camel-service.c:580
+#: calendar/gui/e-calendar-table.c:461 camel/camel-service.c:598
+#: camel/camel-service.c:634
 msgid "Cancelled"
 msgstr ""
 
@@ -2570,7 +2576,7 @@ msgid "Error removing list"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1248
+#: addressbook/gui/widgets/e-addressbook-view.c:1297
 msgid "Error removing card"
 msgstr ""
 
@@ -2841,8 +2847,8 @@ msgstr "Chl�fhoireann..."
 msgid "Print cards"
 msgstr "Priont�il"
 
-#: addressbook/printing/e-contact-print.c:1112
-#: addressbook/printing/e-contact-print.c:1134
+#: addressbook/printing/e-contact-print.c:1152
+#: addressbook/printing/e-contact-print.c:1174
 #, fuzzy
 msgid "Print card"
 msgstr "Priont�il"
@@ -2853,18 +2859,44 @@ msgstr "Priont�il"
 msgid "Print envelope"
 msgstr "Socraigh Priont�il "
 
-#: calendar/conduits/calendar/calendar-conduit.c:735
-#: calendar/conduits/todo/todo-conduit.c:548
+#: calendar/cal-util/cal-util.c:418 calendar/cal-util/cal-util.c:440
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:385 mail/message-list.c:652
+msgid "High"
+msgstr ""
+
+#: calendar/cal-util/cal-util.c:420 calendar/cal-util/cal-util.c:442
+#: calendar/gui/calendar-model.c:1673
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:386 mail/message-list.c:651
+msgid "Normal"
+msgstr "Gn�th"
+
+#: calendar/cal-util/cal-util.c:422 calendar/cal-util/cal-util.c:444
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:387 mail/message-list.c:650
+msgid "Low"
+msgstr ""
+
+#. An empty string is the same as 'None'.
+#: calendar/cal-util/cal-util.c:438
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:388
+msgid "Undefined"
+msgstr ""
+
+#: calendar/conduits/calendar/calendar-conduit.c:793
+#: calendar/conduits/todo/todo-conduit.c:564
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:839
-#: calendar/conduits/calendar/calendar-conduit.c:842
+#: calendar/conduits/calendar/calendar-conduit.c:896
+#: calendar/conduits/calendar/calendar-conduit.c:899
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:653
-#: calendar/conduits/todo/todo-conduit.c:656
+#: calendar/conduits/todo/todo-conduit.c:668
+#: calendar/conduits/todo/todo-conduit.c:671
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
@@ -2912,46 +2944,46 @@ msgstr ""
 msgid "Factory for the alarm notification service"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:152
 #, c-format
 msgid "Notification about your appointment starting on %s and ending on %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:156
 #, c-format
 msgid "Notification about your appointment starting on %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:161
 #, c-format
 msgid "Notification about your appointment ending on %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:165
 #, fuzzy
 msgid "Notification about your appointment"
 msgstr "_Coinne"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:172
 #, c-format
 msgid "Notification about your task starting on %s and ending on %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:176
 #, c-format
 msgid "Notification about your task starting on %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:181
 #, c-format
 msgid "Notification about your task ending on %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:185
 msgid "Notification about your task"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:267
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr ""
 
@@ -3037,7 +3069,7 @@ msgstr "%d %B"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: calendar/gui/calendar-commands.c:467
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1442
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1446
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -3046,17 +3078,17 @@ msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:399 calendar/gui/calendar-model.c:1001
-#: calendar/gui/e-calendar-table.c:307
+#: calendar/gui/calendar-model.c:399 calendar/gui/calendar-model.c:994
+#: calendar/gui/e-calendar-table.c:364
 msgid "Private"
 msgstr "Priobh�dach"
 
-#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:1003
-#: calendar/gui/e-calendar-table.c:308
+#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:996
+#: calendar/gui/e-calendar-table.c:365
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:306
+#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:363
 msgid "Public"
 msgstr ""
 
@@ -3076,68 +3108,49 @@ msgstr ""
 msgid "W"
 msgstr "I"
 
-#: calendar/gui/calendar-model.c:538 calendar/gui/calendar-model.c:1183
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:652
-msgid "High"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1185
-#: calendar/gui/calendar-model.c:1700
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:651
-msgid "Normal"
-msgstr "Gn�th"
-
-#: calendar/gui/calendar-model.c:542 calendar/gui/calendar-model.c:1187
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:650
-msgid "Low"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:573 calendar/gui/calendar-model.c:1220
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/calendar-model.c:566 calendar/gui/calendar-model.c:1193
+#: calendar/gui/e-calendar-table.c:437
 #, fuzzy
 msgid "Free"
 msgstr "Ao"
 
-#: calendar/gui/calendar-model.c:575 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/calendar-model.c:568 calendar/gui/e-calendar-table.c:438
 #: calendar/gui/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:724 calendar/gui/calendar-model.c:1268
+#: calendar/gui/calendar-model.c:717 calendar/gui/calendar-model.c:1241
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:401
+#: calendar/gui/e-calendar-table.c:458
 msgid "Not Started"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:727 calendar/gui/calendar-model.c:1270
+#: calendar/gui/calendar-model.c:720 calendar/gui/calendar-model.c:1243
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:402
+#: calendar/gui/e-calendar-table.c:459
 msgid "In Progress"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:730 calendar/gui/calendar-model.c:1272
+#: calendar/gui/calendar-model.c:723 calendar/gui/calendar-model.c:1245
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-meeting-model.c:298
+#: calendar/gui/e-calendar-table.c:460 calendar/gui/e-meeting-model.c:298
 #: calendar/gui/e-meeting-model.c:321
 msgid "Completed"
 msgstr ""
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:915 e-util/e-time-utils.c:163
+#: calendar/gui/calendar-model.c:908 e-util/e-time-utils.c:163
 #: e-util/e-time-utils.c:354
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:918 e-util/e-time-utils.c:158
+#: calendar/gui/calendar-model.c:911 e-util/e-time-utils.c:158
 #: e-util/e-time-utils.c:363
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:923
+#: calendar/gui/calendar-model.c:916
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -3145,54 +3158,43 @@ msgid ""
 "%s"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1087
+#: calendar/gui/calendar-model.c:1080
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1127
+#: calendar/gui/calendar-model.c:1120
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1168
-msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
-msgstr ""
-
-#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1181
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:331
-msgid "Undefined"
-msgstr ""
-
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1266 calendar/gui/dialogs/meeting-page.c:332
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1444
+#: calendar/gui/calendar-model.c:1239 calendar/gui/dialogs/meeting-page.c:332
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1446
 #: mail/mail-accounts.c:143 mail/mail-accounts.c:390
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:50
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:203
-#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
-#: widgets/misc/e-dateedit.c:1428 widgets/misc/e-dateedit.c:1543
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:453
+#: widgets/misc/e-dateedit.c:1453 widgets/misc/e-dateedit.c:1568
 msgid "None"
 msgstr "Ar Bith"
 
-#: calendar/gui/calendar-model.c:1702
+#: calendar/gui/calendar-model.c:1675
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1704
+#: calendar/gui/calendar-model.c:1677
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1710 calendar/gui/e-meeting-model.c:270
+#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:270
 #: calendar/gui/e-meeting-model.c:280 calendar/gui/e-meeting-model.c:506
 #: calendar/gui/e-meeting-model.c:702
 msgid "Yes"
 msgstr "T�"
 
-#: calendar/gui/calendar-model.c:1710 calendar/gui/e-meeting-model.c:282
+#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:282
 #: calendar/gui/e-meeting-model.c:703
 msgid "No"
 msgstr "N�l"
@@ -3232,43 +3234,43 @@ msgstr ""
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/component-factory.c:62 my-evolution/my-evolution.glade.h:6
+#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:6
 #: shell/e-local-storage.c:172 shell/e-shortcuts.c:1056
 msgid "Calendar"
 msgstr "Feilire"
 
-#: calendar/gui/component-factory.c:63
+#: calendar/gui/component-factory.c:64
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/component-factory.c:67 calendar/gui/print.c:1719
-#: my-evolution/e-summary-tasks.c:215 my-evolution/e-summary-tasks.c:231
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1723
+#: my-evolution/e-summary-tasks.c:237 my-evolution/e-summary-tasks.c:253
 #: shell/e-local-storage.c:178 shell/e-shortcuts.c:1059
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr ""
 
-#: calendar/gui/component-factory.c:68
+#: calendar/gui/component-factory.c:69
 msgid "Folder containing to-do items"
 msgstr ""
 
-#: calendar/gui/component-factory.c:593 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:581 ui/evolution-calendar.xml.h:7
 #, fuzzy
 msgid "Create a new appointment"
 msgstr "Scr�os an sceal seo"
 
-#: calendar/gui/component-factory.c:594 calendar/gui/e-day-view.c:3420
+#: calendar/gui/component-factory.c:582 calendar/gui/e-day-view.c:3422
 #, fuzzy
 msgid "New _Appointment"
 msgstr "Coinne Nua"
 
-#: calendar/gui/component-factory.c:599 ui/evolution-calendar.xml.h:8
+#: calendar/gui/component-factory.c:587 ui/evolution-calendar.xml.h:8
 #: ui/evolution-tasks.xml.h:5
 #, fuzzy
 msgid "Create a new task"
 msgstr "Scr�os an sceal seo"
 
-#: calendar/gui/component-factory.c:600
+#: calendar/gui/component-factory.c:588
 #, fuzzy
 msgid "New _Task"
 msgstr "_Teasc Nua"
@@ -3345,106 +3347,127 @@ msgstr ""
 msgid "minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:303
+#: calendar/gui/dialogs/alarm-page.c:307
 #, fuzzy, c-format
 msgid "%d days"
 msgstr "la(e)"
 
-#: calendar/gui/dialogs/alarm-page.c:305
+#: calendar/gui/dialogs/alarm-page.c:310
 #, fuzzy
 msgid "1 day"
 msgstr " 1 lae"
 
-#: calendar/gui/dialogs/alarm-page.c:308
+#: calendar/gui/dialogs/alarm-page.c:315
 #, fuzzy, c-format
 msgid "%d weeks"
 msgstr " %d seachtain"
 
-#: calendar/gui/dialogs/alarm-page.c:310
+#: calendar/gui/dialogs/alarm-page.c:318
 #, fuzzy
 msgid "1 week"
 msgstr " seachtain"
 
-#: calendar/gui/dialogs/alarm-page.c:313
+#: calendar/gui/dialogs/alarm-page.c:323
 #, fuzzy, c-format
 msgid "%d hours"
 msgstr " %d uaireanta"
 
-#: calendar/gui/dialogs/alarm-page.c:315
+#: calendar/gui/dialogs/alarm-page.c:326
 #, fuzzy
 msgid "1 hour"
 msgstr " 1 uair"
 
-#: calendar/gui/dialogs/alarm-page.c:318
+#: calendar/gui/dialogs/alarm-page.c:331
 #, fuzzy, c-format
 msgid "%d minutes"
 msgstr " %d noime�id"
 
-#: calendar/gui/dialogs/alarm-page.c:320
+#: calendar/gui/dialogs/alarm-page.c:334
 #, fuzzy
 msgid "1 minute"
 msgstr " 1 noime�d"
 
-#: calendar/gui/dialogs/alarm-page.c:323
+#: calendar/gui/dialogs/alarm-page.c:339
 #, fuzzy, c-format
 msgid "%d seconds"
 msgstr "Post"
 
-#: calendar/gui/dialogs/alarm-page.c:325
+#: calendar/gui/dialogs/alarm-page.c:342
 #, fuzzy
 msgid "1 second"
 msgstr " 1 soic�nd"
 
-#: calendar/gui/dialogs/alarm-page.c:350
+#: calendar/gui/dialogs/alarm-page.c:373
 #: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:354
+#: calendar/gui/dialogs/alarm-page.c:377
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 #, fuzzy
 msgid "Display a message"
 msgstr "_Post sce�l"
 
-#: calendar/gui/dialogs/alarm-page.c:358
+#: calendar/gui/dialogs/alarm-page.c:381
 #, fuzzy
 msgid "Send an email"
 msgstr "Post"
 
-#: calendar/gui/dialogs/alarm-page.c:362
+#: calendar/gui/dialogs/alarm-page.c:385
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:368 calendar/gui/dialogs/alarm-page.c:404
-#: calendar/gui/e-meeting-model.c:226 calendar/gui/e-meeting-model.c:261
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:674
-#: calendar/gui/e-meeting-model.c:690
-#: camel/providers/smtp/camel-smtp-transport.c:224
-#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
-msgid "Unknown"
-msgstr "Gan Aithne"
-
-#: calendar/gui/dialogs/alarm-page.c:380
+#: calendar/gui/dialogs/alarm-page.c:391
 #, fuzzy
-msgid "before start of appointment"
+msgid "Unknown action to be performed"
+msgstr "iEarraidh gan Aithne"
+
+#: calendar/gui/dialogs/alarm-page.c:403
+#, fuzzy, c-format
+msgid "%s %s before the start of the appointment"
 msgstr "_Coinne"
 
-#: calendar/gui/dialogs/alarm-page.c:383
-#, fuzzy
-msgid "after start of appointment"
+#: calendar/gui/dialogs/alarm-page.c:406
+#, fuzzy, c-format
+msgid "%s %s after the start of the appointment"
 msgstr "_Coinne"
 
-#: calendar/gui/dialogs/alarm-page.c:393
-#, fuzzy
-msgid "before end of appointment"
+#: calendar/gui/dialogs/alarm-page.c:411
+#, fuzzy, c-format
+msgid "%s at the start of the appointment"
 msgstr "_Coinne"
 
-#: calendar/gui/dialogs/alarm-page.c:396
-#, fuzzy
-msgid "after end of appointment"
+#: calendar/gui/dialogs/alarm-page.c:420
+#, fuzzy, c-format
+msgid "%s %s before the end of the appointment"
+msgstr "_Coinne"
+
+#: calendar/gui/dialogs/alarm-page.c:423
+#, fuzzy, c-format
+msgid "%s %s after the end of the appointment"
+msgstr "_Coinne"
+
+#: calendar/gui/dialogs/alarm-page.c:428
+#, fuzzy, c-format
+msgid "%s at the end of the appointment"
 msgstr "_Coinne"
 
+#: calendar/gui/dialogs/alarm-page.c:439
+#, fuzzy, c-format
+msgid "%s at an unknown time"
+msgstr "iEarraidh gan Aithne"
+
+#: calendar/gui/dialogs/alarm-page.c:445
+#, c-format
+msgid "%s at %s"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:452
+#, c-format
+msgid "%s for an unknown trigger type"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3784,110 +3807,110 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:159 calendar/gui/print.c:2128
+#: calendar/gui/dialogs/comp-editor-util.c:167 calendar/gui/print.c:2132
 msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:163 calendar/gui/print.c:2132
+#: calendar/gui/dialogs/comp-editor-util.c:171 calendar/gui/print.c:2136
 #, fuzzy
 msgid " (Completed "
 msgstr "Cr�ochnaithe.`"
 
-#: calendar/gui/dialogs/comp-editor-util.c:165 calendar/gui/print.c:2134
+#: calendar/gui/dialogs/comp-editor-util.c:173 calendar/gui/print.c:2138
 #, fuzzy
 msgid "Completed "
 msgstr "Cr�ochnaithe.`"
 
-#: calendar/gui/dialogs/comp-editor-util.c:170 calendar/gui/print.c:2139
+#: calendar/gui/dialogs/comp-editor-util.c:178 calendar/gui/print.c:2143
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2141
+#: calendar/gui/dialogs/comp-editor-util.c:180 calendar/gui/print.c:2145
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:515
+#: calendar/gui/dialogs/comp-editor.c:521
 msgid "Edit Appointment"
 msgstr "Eagar Coinne"
 
-#: calendar/gui/dialogs/comp-editor.c:520
+#: calendar/gui/dialogs/comp-editor.c:526
 #, c-format
 msgid "Appointment - %s"
 msgstr "Coinne - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:523
+#: calendar/gui/dialogs/comp-editor.c:529
 #, c-format
 msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:526
+#: calendar/gui/dialogs/comp-editor.c:532
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:540
+#: calendar/gui/dialogs/comp-editor.c:546
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:950 mail/mail-callbacks.c:1662
+#: calendar/gui/dialogs/comp-editor.c:952 mail/mail-callbacks.c:1671
 #: mail/mail-display.c:100
 msgid "Overwrite file?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:954 mail/mail-callbacks.c:1668
+#: calendar/gui/dialogs/comp-editor.c:956 mail/mail-callbacks.c:1677
 #: mail/mail-display.c:104
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1017 ui/evolution-comp-editor.xml.h:13
+#: calendar/gui/dialogs/comp-editor.c:1019 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "S�bh�il le..."
 
-#: calendar/gui/dialogs/comp-editor.c:1170
+#: calendar/gui/dialogs/comp-editor.c:1172
 msgid "Unable to obtain current version!"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:90
+#: calendar/gui/dialogs/delete-comp.c:91
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:93
+#: calendar/gui/dialogs/delete-comp.c:94
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:100
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:102
+#: calendar/gui/dialogs/delete-comp.c:103
 msgid "Are you sure you want to delete this untitled task?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:109
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:111
+#: calendar/gui/dialogs/delete-comp.c:112
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:126
+#: calendar/gui/dialogs/delete-comp.c:127
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:131
+#: calendar/gui/dialogs/delete-comp.c:132
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:136
+#: calendar/gui/dialogs/delete-comp.c:137
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr ""
@@ -4082,7 +4105,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:18
-#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:85
+#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:86
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Saghas"
@@ -4104,8 +4127,8 @@ msgstr ""
 msgid "_Other Organizer"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:422 calendar/gui/print.c:1851
-#: calendar/gui/print.c:1853 calendar/gui/print.c:1854
+#: calendar/gui/dialogs/recurrence-page.c:422 calendar/gui/print.c:1855
+#: calendar/gui/print.c:1857 calendar/gui/print.c:1858
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
@@ -4226,7 +4249,7 @@ msgid "Progress"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:910
+#: my-evolution/e-summary-preferences.c:949
 msgid "URL:"
 msgstr "URL:"
 
@@ -4247,7 +4270,7 @@ msgstr "Coinne"
 
 #: calendar/gui/dialogs/task-page.glade.h:4
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:28
 msgid "Description:"
 msgstr ""
 
@@ -4263,110 +4286,110 @@ msgstr ""
 msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:350
+#: calendar/gui/e-calendar-table.c:407
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:351
+#: calendar/gui/e-calendar-table.c:408
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:409
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:410
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:411
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:412
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:356
+#: calendar/gui/e-calendar-table.c:413
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:357
+#: calendar/gui/e-calendar-table.c:414
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:358
+#: calendar/gui/e-calendar-table.c:415
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:359
+#: calendar/gui/e-calendar-table.c:416
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:360
+#: calendar/gui/e-calendar-table.c:417
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3441
-#: calendar/gui/e-week-view.c:3288 mail/folder-browser.c:1336
+#: calendar/gui/e-calendar-table.c:914 calendar/gui/e-day-view.c:3443
+#: calendar/gui/e-week-view.c:3296 mail/folder-browser.c:1371
 #: shell/e-shortcuts-view.c:385
 #, fuzzy
 msgid "_Open"
 msgstr "Osc�il"
 
-#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3450
-#: calendar/gui/e-week-view.c:3297 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:918 calendar/gui/e-day-view.c:3452
+#: calendar/gui/e-week-view.c:3305 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Gearr"
 
-#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3452
-#: calendar/gui/e-week-view.c:3299 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:920 calendar/gui/e-day-view.c:3454
+#: calendar/gui/e-week-view.c:3307 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:14
 msgid "_Copy"
 msgstr "_C�ip"
 
-#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3427
-#: calendar/gui/e-day-view.c:3454 calendar/gui/e-week-view.c:3275
-#: calendar/gui/e-week-view.c:3301 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:922 calendar/gui/e-day-view.c:3429
+#: calendar/gui/e-day-view.c:3456 calendar/gui/e-week-view.c:3283
+#: calendar/gui/e-week-view.c:3309 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:40 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:17
 msgid "_Paste"
 msgstr "_Greamaigh"
 
-#: calendar/gui/e-calendar-table.c:863
+#: calendar/gui/e-calendar-table.c:927
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "_Post sce�l"
 
-#: calendar/gui/e-calendar-table.c:865
+#: calendar/gui/e-calendar-table.c:929
 #, fuzzy
 msgid "_Delete this Task"
 msgstr "Scr�os an sceal seo"
 
-#: calendar/gui/e-calendar-table.c:868
+#: calendar/gui/e-calendar-table.c:932
 #, fuzzy
 msgid "_Mark Tasks as Complete"
 msgstr "_Post sce�l"
 
-#: calendar/gui/e-calendar-table.c:870
+#: calendar/gui/e-calendar-table.c:934
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Scr�os an sceal seo"
 
-#: calendar/gui/e-calendar-table.c:1130
+#: calendar/gui/e-calendar-table.c:1194
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr ""
@@ -4375,8 +4398,8 @@ msgstr ""
 msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:702
-#: camel/camel-filter-driver.c:819
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:718
+#: camel/camel-filter-driver.c:834
 msgid "Complete"
 msgstr ""
 
@@ -4407,8 +4430,8 @@ 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:30 shell/e-shortcuts.c:1050
-#: shell/e-storage-set-view.c:1424 shell/e-summary-storage.c:80
+#: my-evolution/component-factory.c:45 shell/e-shortcuts.c:1050
+#: shell/e-storage-set-view.c:1420 shell/e-summary-storage.c:80
 msgid "Summary"
 msgstr ""
 
@@ -4428,7 +4451,7 @@ 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:285 calendar/gui/e-day-view.c:1374
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1458
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -4440,285 +4463,302 @@ 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:608 calendar/gui/e-week-view.c:344
-#: calendar/gui/print.c:765
+#: calendar/gui/e-day-view.c:608 calendar/gui/e-week-view.c:345
+#: calendar/gui/print.c:769
 msgid "am"
 msgstr "rn"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:347
-#: calendar/gui/print.c:767
+#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:348
+#: calendar/gui/print.c:771
 msgid "pm"
 msgstr "in"
 
-#: calendar/gui/e-day-view.c:3422 calendar/gui/e-week-view.c:3270
+#: calendar/gui/e-day-view.c:3424 calendar/gui/e-week-view.c:3278
 #, fuzzy
 msgid "New All Day _Event"
 msgstr "Scr�os an sceal seo"
 
-#: calendar/gui/e-day-view.c:3432 calendar/gui/e-week-view.c:3280
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3288
 #: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3282
+#: calendar/gui/e-day-view.c:3436 calendar/gui/e-week-view.c:3290
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "_Fillte�n"
 
-#: calendar/gui/e-day-view.c:3443 calendar/gui/e-week-view.c:3290
+#: calendar/gui/e-day-view.c:3445 calendar/gui/e-week-view.c:3298
 #, fuzzy
 msgid "_Delete this Appointment"
 msgstr "Scr�os an sceal seo"
 
-#: calendar/gui/e-day-view.c:3462 calendar/gui/e-week-view.c:3315
+#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3323
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "Scr�os an sceal seo"
 
-#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3317
+#: calendar/gui/e-day-view.c:3466 calendar/gui/e-week-view.c:3325
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "Scr�os an sceal seo"
 
-#: calendar/gui/e-day-view.c:3466 calendar/gui/e-week-view.c:3319
+#: calendar/gui/e-day-view.c:3468 calendar/gui/e-week-view.c:3327
 msgid "Delete _All Occurrences"
 msgstr ""
 
+#: calendar/gui/e-itip-control.c:469
+msgid "Meeting begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:474
+msgid "Task begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:479
+#, fuzzy
+msgid "Free/Busy info begins: <b>"
+msgstr "Eolas"
+
+#: calendar/gui/e-itip-control.c:483
+msgid "Begins: <b>"
+msgstr ""
+
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:677
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:664
+#: calendar/gui/e-itip-control.c:692
 #, c-format
 msgid "<b>Summary:</b> %s<br><br>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:664
+#: calendar/gui/e-itip-control.c:692
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:674
+#: calendar/gui/e-itip-control.c:702
 #, c-format
 msgid "<b>Description:</b> %s"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:737
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:738
 #, fuzzy
 msgid "Meeting Information"
 msgstr "Eolas"
 
-#: calendar/gui/e-itip-control.c:715
+#: calendar/gui/e-itip-control.c:742
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:716
+#: calendar/gui/e-itip-control.c:743
 msgid "Meeting Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-itip-control.c:747
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:721
+#: calendar/gui/e-itip-control.c:748
 msgid "Meeting Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:725
+#: calendar/gui/e-itip-control.c:752
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:726
+#: calendar/gui/e-itip-control.c:753
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:730
+#: calendar/gui/e-itip-control.c:757
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:731
+#: calendar/gui/e-itip-control.c:758
 msgid "Meeting Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:735
+#: calendar/gui/e-itip-control.c:762
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:736
+#: calendar/gui/e-itip-control.c:763
 msgid "Meeting Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:740 calendar/gui/e-itip-control.c:788
-#: calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:767 calendar/gui/e-itip-control.c:815
+#: calendar/gui/e-itip-control.c:848
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:741
+#: calendar/gui/e-itip-control.c:768
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "Post an sce�l seo"
 
-#: calendar/gui/e-itip-control.c:758
+#: calendar/gui/e-itip-control.c:785
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:759
+#: calendar/gui/e-itip-control.c:786
 #, fuzzy
 msgid "Task Information"
 msgstr "Eolas"
 
-#: calendar/gui/e-itip-control.c:763
+#: calendar/gui/e-itip-control.c:790
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:791
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:768
+#: calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:769
+#: calendar/gui/e-itip-control.c:796
 msgid "Task Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:773
+#: calendar/gui/e-itip-control.c:800
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:774
+#: calendar/gui/e-itip-control.c:801
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:778
+#: calendar/gui/e-itip-control.c:805
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:806
 #, fuzzy
 msgid "Task Reply"
 msgstr "Freagrair"
 
-#: calendar/gui/e-itip-control.c:783
+#: calendar/gui/e-itip-control.c:810
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:784
+#: calendar/gui/e-itip-control.c:811
 msgid "Task Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:816
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "_Post sce�l"
 
-#: calendar/gui/e-itip-control.c:806
+#: calendar/gui/e-itip-control.c:833
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:807
+#: calendar/gui/e-itip-control.c:834
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "Eolas"
 
-#: calendar/gui/e-itip-control.c:811
+#: calendar/gui/e-itip-control.c:838
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:812
+#: calendar/gui/e-itip-control.c:839
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:816
+#: calendar/gui/e-itip-control.c:843
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:817
+#: calendar/gui/e-itip-control.c:844
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:822
+#: calendar/gui/e-itip-control.c:849
 msgid "Bad Free/Busy Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:889
+#: calendar/gui/e-itip-control.c:916
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:908
+#: calendar/gui/e-itip-control.c:935
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:936 calendar/gui/e-itip-control.c:942
+#: calendar/gui/e-itip-control.c:963 calendar/gui/e-itip-control.c:969
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1088
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1063
+#: calendar/gui/e-itip-control.c:1090
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.c:1134
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1142
 msgid "Attendee status ould not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1144
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1119
+#: calendar/gui/e-itip-control.c:1146
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1174
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-itip-control.c:1176
 #, fuzzy
 msgid "Removal Complete"
 msgstr "% Rinneadh:"
 
-#: calendar/gui/e-itip-control.c:1181 calendar/gui/e-itip-control.c:1216
+#: calendar/gui/e-itip-control.c:1208 calendar/gui/e-itip-control.c:1242
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1183 calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1210 calendar/gui/e-itip-control.c:1246
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1380
+#: calendar/gui/e-itip-control.c:1406
 msgid "Unable to find any of your identities in the attendees list!\n"
 msgstr ""
 
@@ -4780,6 +4820,14 @@ msgstr ""
 msgid "Room"
 msgstr ""
 
+#: calendar/gui/e-meeting-model.c:226 calendar/gui/e-meeting-model.c:261
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:674
+#: calendar/gui/e-meeting-model.c:690
+#: camel/providers/smtp/camel-smtp-transport.c:224
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
+msgid "Unknown"
+msgstr "Gan Aithne"
+
 #: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
 #: calendar/gui/e-meeting-model.c:686
 msgid "Chair"
@@ -4834,14 +4882,14 @@ msgstr ""
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:472
-#: calendar/gui/e-meeting-time-sel.c:1936
+#: calendar/gui/e-meeting-time-sel.c:1937
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:476
-#: calendar/gui/e-meeting-time-sel.c:1964 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:1965 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:345
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
@@ -4849,7 +4897,7 @@ msgstr "%a %d/%m/%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:480 e-util/e-time-utils.c:221
-#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1552
+#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1577
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
@@ -4927,17 +4975,17 @@ msgstr ""
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3268 calendar/gui/e-week-view.c:3306
+#: calendar/gui/e-week-view.c:3276 calendar/gui/e-week-view.c:3314
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "Coinne Nua..."
 
-#: calendar/gui/gnome-cal.c:1318
+#: calendar/gui/gnome-cal.c:1319
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1329
+#: calendar/gui/gnome-cal.c:1330
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
@@ -5006,202 +5054,202 @@ msgstr ""
 msgid "Could not create the component editor factory"
 msgstr ""
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "1st"
 msgstr ""
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "2nd"
 msgstr ""
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "3rd"
 msgstr ""
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "4th"
 msgstr ""
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "5th"
 msgstr ""
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "6th"
 msgstr ""
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "7th"
 msgstr ""
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "8th"
 msgstr ""
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "9th"
 msgstr ""
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "10th"
 msgstr ""
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "11th"
 msgstr ""
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "12th"
 msgstr ""
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "13th"
 msgstr ""
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "14th"
 msgstr ""
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "15th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "16th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "17th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "18th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "19th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "20th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "21st"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "22nd"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "23rd"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "24th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "25th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "26th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "27th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "28th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "29th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "30th"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:432
 msgid "31st"
 msgstr ""
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "Su"
 msgstr "Do"
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "Mo"
 msgstr "Lu"
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "Tu"
 msgstr "Ma"
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "We"
 msgstr "Ce"
 
-#: calendar/gui/print.c:497
+#: calendar/gui/print.c:500
 msgid "Th"
 msgstr "De"
 
-#: calendar/gui/print.c:497
+#: calendar/gui/print.c:500
 msgid "Fr"
 msgstr "Ao"
 
-#: calendar/gui/print.c:497
+#: calendar/gui/print.c:500
 msgid "Sa"
 msgstr "Sa"
 
 #. Day
-#: calendar/gui/print.c:1827
+#: calendar/gui/print.c:1831
 msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1846 calendar/gui/print.c:1850
+#: calendar/gui/print.c:1850 calendar/gui/print.c:1854
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1847
+#: calendar/gui/print.c:1851
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1858
+#: calendar/gui/print.c:1862
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1866
+#: calendar/gui/print.c:1870
 msgid "Selected month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1873
+#: calendar/gui/print.c:1877
 msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:2214
+#: calendar/gui/print.c:2221
 msgid "Print Calendar"
 msgstr ""
 
-#: calendar/gui/print.c:2302 calendar/gui/print.c:2394
-#: mail/mail-callbacks.c:2071 my-evolution/e-summary.c:551
+#: calendar/gui/print.c:2312 calendar/gui/print.c:2404
+#: mail/mail-callbacks.c:2080 my-evolution/e-summary.c:607
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
 msgstr ""
 
-#: calendar/gui/print.c:2331
+#: calendar/gui/print.c:2341
 #, fuzzy
 msgid "Print Item"
 msgstr "Scr�os an sceal seo"
 
-#: calendar/gui/print.c:2412
+#: calendar/gui/print.c:2422
 msgid "Print Setup"
 msgstr "Socraigh Priont�il "
 
@@ -5385,65 +5433,80 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr ""
 
-#: camel/camel-disco-store.c:305
+#: camel/camel-disco-store.c:336
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
+#: camel/camel-filter-driver.c:549 camel/camel-filter-driver.c:558
 msgid "Syncing folders"
 msgstr ""
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:659
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:668
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:667
+#: camel/camel-filter-driver.c:683
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr ""
 
-#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
+#: camel/camel-filter-driver.c:687 camel/camel-filter-driver.c:700
 #, fuzzy, c-format
 msgid "Failed on message %d"
 msgstr "_Post sce�l"
 
-#: camel/camel-filter-driver.c:672
+#: camel/camel-filter-driver.c:688
 msgid "Cannot open message"
 msgstr ""
 
-#: camel/camel-filter-driver.c:698 camel/camel-filter-driver.c:814
+#: camel/camel-filter-driver.c:714 camel/camel-filter-driver.c:829
 msgid "Syncing folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:770
+#: camel/camel-filter-driver.c:786
 #, c-format
 msgid "Getting message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:775 camel/camel-filter-driver.c:793
+#: camel/camel-filter-driver.c:791 camel/camel-filter-driver.c:809
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:900
+#: camel/camel-filter-driver.c:918
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:906
+#: camel/camel-filter-driver.c:924
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-search.c:479 camel/camel-filter-search.c:486
+#: camel/camel-filter-search.c:494 camel/camel-filter-search.c:501
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
 
+#: camel/camel-folder.c:472
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1039
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1219
+#, fuzzy
+msgid "Moving messages"
+msgstr "_Post sce�l"
+
 #: camel/camel-folder-search.c:333
 #, c-format
 msgid ""
@@ -5467,7 +5530,7 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:747 camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:748 camel/camel-folder-search.c:792
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
@@ -5566,73 +5629,73 @@ msgstr ""
 msgid "Error copying mail temp file: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:193
+#: camel/camel-pgp-context.c:191
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:196
+#: camel/camel-pgp-context.c:194
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr ""
 
-#: camel/camel-pgp-context.c:518
+#: camel/camel-pgp-context.c:525
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr ""
 
-#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:532 camel/camel-pgp-context.c:706
 msgid "Cannot sign this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:538 camel/camel-pgp-context.c:712
 #, c-format
 msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:693
+#: camel/camel-pgp-context.c:699
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr ""
 
-#: camel/camel-pgp-context.c:886
+#: camel/camel-pgp-context.c:891
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr ""
 
-#: camel/camel-pgp-context.c:892
+#: camel/camel-pgp-context.c:897
 #, c-format
 msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:903
+#: camel/camel-pgp-context.c:908
 #, c-format
 msgid "Cannot verify this message: couldn't create temp file: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1069
+#: camel/camel-pgp-context.c:1076
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1079
+#: camel/camel-pgp-context.c:1086
 msgid "Cannot encrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1086
+#: camel/camel-pgp-context.c:1093
 #, c-format
 msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1095
+#: camel/camel-pgp-context.c:1102
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1258
+#: camel/camel-pgp-context.c:1264
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1266
+#: camel/camel-pgp-context.c:1272
 msgid "Cannot decrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1273
+#: camel/camel-pgp-context.c:1279
 #, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
@@ -5676,13 +5739,13 @@ msgstr ""
 msgid "(unknown host)"
 msgstr "(�st gan aithne)"
 
-#: camel/camel-remote-store.c:361 camel/camel-remote-store.c:423
-#: camel/camel-remote-store.c:486
+#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
+#: camel/camel-remote-store.c:483
 #: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr ""
 
-#: camel/camel-remote-store.c:489
+#: camel/camel-remote-store.c:486
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -5780,7 +5843,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:492
+#: camel/providers/imap/camel-imap-store.c:494
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -5798,7 +5861,7 @@ msgstr ""
 
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:302
-#: camel/providers/pop3/camel-pop3-provider.c:68 mail/mail-config.glade.h:54
+#: camel/providers/pop3/camel-pop3-provider.c:68 mail/mail-config.glade.h:55
 msgid "Password"
 msgstr "Pasfhocal"
 
@@ -5827,37 +5890,37 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:154
+#: camel/camel-service.c:157
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:162
+#: camel/camel-service.c:165
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:170
+#: camel/camel-service.c:173
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:548
+#: camel/camel-service.c:602
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:575
+#: camel/camel-service.c:629
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:600
+#: camel/camel-service.c:654
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:602
+#: camel/camel-service.c:656
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
@@ -5870,12 +5933,12 @@ msgstr ""
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:322 camel/camel-session.c:391
+#: camel/camel-session.c:324 camel/camel-session.c:393
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:508
+#: camel/camel-session.c:510
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -5925,7 +5988,7 @@ msgstr ""
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Te�p ag fork: %s"
 
-#: camel/camel-tcp-stream-openssl.c:463
+#: camel/camel-tcp-stream-openssl.c:491
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -5933,7 +5996,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:369
+#: camel/camel-tcp-stream-openssl.c:496 camel/camel-tcp-stream-ssl.c:369
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -5960,17 +6023,37 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr ""
 
-#: camel/camel-vee-folder.c:546
+#: camel/camel-vee-folder.c:554
 #, fuzzy, c-format
 msgid "No such message %s in %s"
 msgstr "Post an sce�l seo"
 
-#: camel/camel-vee-folder.c:641
+#: camel/camel-vee-folder.c:649
 #, fuzzy, c-format
 msgid "No such message: %s"
 msgstr "Post an sce�l seo"
 
-#: camel/camel-vtrash-folder.c:106
+#: camel/camel-vee-store.c:250
+#, fuzzy, c-format
+msgid "Cannot delete folder: %s: Invalid operation"
+msgstr "Te�p ag fork: %s"
+
+#: camel/camel-vee-store.c:286
+#, fuzzy, c-format
+msgid "Cannot delete folder: %s: No such folder"
+msgstr "Te�p ag fork: %s"
+
+#: camel/camel-vee-store.c:298
+#, fuzzy, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "Te�p ag fork: %s"
+
+#: camel/camel-vee-store.c:326
+#, fuzzy, c-format
+msgid "Cannot rename folder: %s: No such folder"
+msgstr "Te�p ag fork: %s"
+
+#: camel/camel-vtrash-folder.c:109
 msgid "You cannot copy messages from this trash folder."
 msgstr ""
 
@@ -6019,7 +6102,7 @@ msgid "Scanning for changed messages"
 msgstr "Ag S�bh�il scealta"
 
 #: camel/providers/imap/camel-imap-folder.c:1491
-#: camel/providers/imap/camel-imap-folder.c:1890
+#: camel/providers/imap/camel-imap-folder.c:1899
 msgid "This message is not currently available"
 msgstr ""
 
@@ -6033,7 +6116,7 @@ msgstr ""
 msgid "Scanning for new messages"
 msgstr "Ag S�bh�il scealta"
 
-#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/imap/camel-imap-folder.c:1936
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -6050,7 +6133,7 @@ msgstr "Te�p ag fork: %s"
 msgid "Failed to cache message %s: %s"
 msgstr "_Post sce�l"
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:14
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:15
 msgid "Checking for new mail"
 msgstr ""
 
@@ -6058,7 +6141,7 @@ msgstr ""
 msgid "Check for new messages in all folders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:733
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:767
 msgid "Folders"
 msgstr "Fillte�in"
 
@@ -6091,28 +6174,28 @@ msgstr ""
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:515
+#: camel/providers/imap/camel-imap-store.c:517
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:525
+#: camel/providers/imap/camel-imap-store.c:527
 #: camel/providers/smtp/camel-smtp-transport.c:388
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap/camel-imap-store.c:551
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:566
 #: camel/providers/smtp/camel-smtp-transport.c:432
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:590
+#: camel/providers/imap/camel-imap-store.c:592
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6120,12 +6203,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:889
+#: camel/providers/imap/camel-imap-store.c:891
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "Post an sce�l seo"
 
-#: camel/providers/imap/camel-imap-store.c:1090
+#: camel/providers/imap/camel-imap-store.c:1131
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -6158,51 +6241,51 @@ msgstr ""
 msgid "For storing local mail in qmail maildir directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:77
+#: camel/providers/local/camel-local-provider.c:78
 msgid "Standard Unix mbox spools"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:78
+#: camel/providers/local/camel-local-provider.c:79
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:127
-#: camel/providers/local/camel-spool-store.c:112
+#: camel/providers/local/camel-local-store.c:132
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:134
+#: camel/providers/local/camel-local-store.c:139
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:142
-#: camel/providers/local/camel-local-store.c:158
+#: camel/providers/local/camel-local-store.c:147
+#: camel/providers/local/camel-local-store.c:163
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:173
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:183
+#: camel/providers/local/camel-local-store.c:190
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:240
+#: camel/providers/local/camel-local-store.c:247
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:282
+#: camel/providers/local/camel-local-store.c:289
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:292
+#: camel/providers/local/camel-local-store.c:299
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
@@ -6475,26 +6558,26 @@ msgstr ""
 "Earraidh ag s�bhh�il sc�ala� do: %s\n"
 " %s"
 
-#: camel/providers/local/camel-spool-store.c:133
+#: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Spool `%s' does not exist or is not a regular file"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:159
+#: camel/providers/local/camel-spool-store.c:142
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:181
+#: camel/providers/local/camel-spool-store.c:164
 #, c-format
 msgid "Spool mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:227
+#: camel/providers/local/camel-spool-store.c:210
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:235
+#: camel/providers/local/camel-spool-store.c:218
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
@@ -6616,31 +6699,31 @@ msgstr ""
 msgid "Could not check POP server for new messages: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:235
+#: camel/providers/pop3/camel-pop3-folder.c:242
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:259
+#: camel/providers/pop3/camel-pop3-folder.c:266
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "Scr�os an sceal seo"
 
-#: camel/providers/pop3/camel-pop3-folder.c:335
+#: camel/providers/pop3/camel-pop3-folder.c:342
 #, fuzzy, c-format
 msgid "Could not fetch message: %s"
 msgstr "Post an sce�l seo"
 
-#: camel/providers/pop3/camel-pop3-folder.c:351
+#: camel/providers/pop3/camel-pop3-folder.c:358
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:374
+#: camel/providers/pop3/camel-pop3-folder.c:381
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:378
+#: camel/providers/pop3/camel-pop3-folder.c:385
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr ""
@@ -6658,7 +6741,7 @@ msgstr ""
 msgid "Delete after %s day(s)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:53
+#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:54
 msgid "POP"
 msgstr "POP"
 
@@ -6740,7 +6823,7 @@ msgid "Unexpected response from POP server: %s"
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:73
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -6792,7 +6875,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:66
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -7401,13 +7484,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:309 e-util/e-time-utils.c:396
-#: widgets/misc/e-dateedit.c:1360 widgets/misc/e-dateedit.c:1587
+#: widgets/misc/e-dateedit.c:1385 widgets/misc/e-dateedit.c:1612
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:313 e-util/e-time-utils.c:388
-#: widgets/misc/e-dateedit.c:1357 widgets/misc/e-dateedit.c:1584
+#: widgets/misc/e-dateedit.c:1382 widgets/misc/e-dateedit.c:1609
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -7548,8 +7631,8 @@ msgid ""
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:232 filter/vfolder-rule.c:351
-#: mail/mail-account-gui.c:820
+#: filter/filter-folder.c:232 filter/vfolder-rule.c:356
+#: mail/mail-account-gui.c:822
 #, fuzzy
 msgid "Select Folder"
 msgstr "Fillte�n _Nua"
@@ -7799,7 +7882,7 @@ msgstr ""
 msgid "Score"
 msgstr "Sc�r"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1242
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1251
 #, fuzzy
 msgid "Sender"
 msgstr "Post"
@@ -7833,7 +7916,7 @@ msgstr ""
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:893
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:917
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Abair"
@@ -7863,7 +7946,7 @@ msgstr "Eagar"
 msgid "Score Rules"
 msgstr ""
 
-#: filter/vfolder-rule.c:203
+#: filter/vfolder-rule.c:206
 msgid "Oops.  You need to to specify at least one folder as a source."
 msgstr ""
 
@@ -7882,19 +7965,19 @@ msgstr "S�bh�il 'san _fillte�n"
 msgid "Please wait"
 msgstr ""
 
-#: importers/elm-importer.c:171 importers/netscape-importer.c:701
+#: importers/elm-importer.c:171 importers/netscape-importer.c:708
 #: importers/pine-importer.c:369
 #, c-format
 msgid "Importing %s as %s"
 msgstr ""
 
-#: importers/elm-importer.c:377 importers/netscape-importer.c:794
+#: importers/elm-importer.c:377 importers/netscape-importer.c:801
 #: importers/pine-importer.c:506
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "Ag Oscailt '%s'"
 
-#: importers/elm-importer.c:528 importers/netscape-importer.c:967
+#: importers/elm-importer.c:528 importers/netscape-importer.c:974
 #: importers/pine-importer.c:669 mail/component-factory.c:96
 #, fuzzy
 msgid "Mail"
@@ -7930,19 +8013,19 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: importers/netscape-importer.c:897 importers/pine-importer.c:602
+#: importers/netscape-importer.c:904 importers/pine-importer.c:602
 msgid "Scanning directory"
 msgstr ""
 
-#: importers/netscape-importer.c:906
+#: importers/netscape-importer.c:913
 msgid "Starting import"
 msgstr ""
 
-#: importers/netscape-importer.c:972
+#: importers/netscape-importer.c:979
 msgid "Settings"
 msgstr ""
 
-#: importers/netscape-importer.c:993
+#: importers/netscape-importer.c:1000
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8024,21 +8107,27 @@ msgstr "_Roghanna..."
 msgid "Change this folder's properties"
 msgstr ""
 
-#: mail/component-factory.c:790
+#: mail/component-factory.c:698
+msgid ""
+"Some of your mail settings seem corrupt, please check that everything is in "
+"order."
+msgstr ""
+
+#: mail/component-factory.c:812
 #, fuzzy
 msgid "New Mail Message"
 msgstr "_Post sce�l"
 
-#: mail/component-factory.c:790
+#: mail/component-factory.c:812
 #, fuzzy
 msgid "New _Mail Message"
 msgstr "_Post sce�l"
 
-#: mail/component-factory.c:821
+#: mail/component-factory.c:843
 msgid "Cannot initialize Evolution's mail component."
 msgstr ""
 
-#: mail/component-factory.c:1007
+#: mail/component-factory.c:1032
 msgid "Cannot register storage with shell"
 msgstr ""
 
@@ -8051,169 +8140,169 @@ msgstr ""
 msgid "Properties"
 msgstr ""
 
-#: mail/folder-browser.c:239 mail/mail-display.c:275
+#: mail/folder-browser.c:262 mail/mail-display.c:275
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/folder-browser.c:708
+#: mail/folder-browser.c:734
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/folder-browser.c:711 mail/folder-browser.c:716
-#: mail/folder-browser.c:720
+#: mail/folder-browser.c:737 mail/folder-browser.c:742
+#: mail/folder-browser.c:746
 msgid ", "
 msgstr ""
 
-#: mail/folder-browser.c:712
+#: mail/folder-browser.c:738
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/folder-browser.c:717
+#: mail/folder-browser.c:743
 #, fuzzy, c-format
 msgid "%d selected"
 msgstr "Post"
 
-#: mail/folder-browser.c:722
+#: mail/folder-browser.c:748
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr "Post"
 
-#: mail/folder-browser.c:724
+#: mail/folder-browser.c:750
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/folder-browser.c:958
+#: mail/folder-browser.c:993
 msgid "Create vFolder from Search"
 msgstr ""
 
-#: mail/folder-browser.c:1303
+#: mail/folder-browser.c:1338
 #, fuzzy
 msgid "VFolder on _Subject"
 msgstr "Abair"
 
-#: mail/folder-browser.c:1306
+#: mail/folder-browser.c:1341
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:1309
+#: mail/folder-browser.c:1344
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:1312
+#: mail/folder-browser.c:1347
 #, fuzzy
 msgid "VFolder on Mailing _List"
 msgstr "Abair"
 
-#: mail/folder-browser.c:1318
+#: mail/folder-browser.c:1353
 #, fuzzy
 msgid "Filter on Sub_ject"
 msgstr "Abair"
 
-#: mail/folder-browser.c:1321
+#: mail/folder-browser.c:1356
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/folder-browser.c:1324
+#: mail/folder-browser.c:1359
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/folder-browser.c:1327
+#: mail/folder-browser.c:1362
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1338 ui/evolution-mail-message.xml.h:89
+#: mail/folder-browser.c:1373 ui/evolution-mail-message.xml.h:89
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "S�bh�il 'san _fillte�n"
 
-#: mail/folder-browser.c:1340 ui/evolution-mail-message.xml.h:97
+#: mail/folder-browser.c:1375 ui/evolution-mail-message.xml.h:97
 msgid "_Save As..."
 msgstr "_S�bh�il le..."
 
-#: mail/folder-browser.c:1342
+#: mail/folder-browser.c:1377
 msgid "_Print"
 msgstr "_Priont�il"
 
-#: mail/folder-browser.c:1347 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1382 ui/evolution-mail-message.xml.h:96
 #, fuzzy
 msgid "_Reply to Sender"
 msgstr "Freagrair"
 
-#: mail/folder-browser.c:1349 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1384 ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Reply to _List"
 msgstr "Freagrair"
 
-#: mail/folder-browser.c:1351 ui/evolution-mail-message.xml.h:68
+#: mail/folder-browser.c:1386 ui/evolution-mail-message.xml.h:68
 #, fuzzy
 msgid "Reply to _All"
 msgstr "Freagrair"
 
-#: mail/folder-browser.c:1353
+#: mail/folder-browser.c:1388
 #, fuzzy
 msgid "_Forward"
 msgstr "Sheoladh Chuig duine"
 
-#: mail/folder-browser.c:1356 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1391 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/folder-browser.c:1358 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1393 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr ""
 
-#: mail/folder-browser.c:1360
+#: mail/folder-browser.c:1395
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/folder-browser.c:1362
+#: mail/folder-browser.c:1397
 msgid "Mark as Unim_portant"
 msgstr ""
 
-#: mail/folder-browser.c:1367
+#: mail/folder-browser.c:1402
 #, fuzzy
 msgid "_Move to Folder..."
 msgstr "S�bh�il 'san _fillte�n"
 
-#: mail/folder-browser.c:1369
+#: mail/folder-browser.c:1404
 #, fuzzy
 msgid "_Copy to Folder..."
 msgstr "_Fillte�n"
 
-#: mail/folder-browser.c:1373 ui/evolution-mail-message.xml.h:99
+#: mail/folder-browser.c:1408 ui/evolution-mail-message.xml.h:99
 msgid "_Undelete"
 msgstr ""
 
-#: mail/folder-browser.c:1378
+#: mail/folder-browser.c:1413
 msgid "Add Sender to Address Book"
 msgstr ""
 
-#: mail/folder-browser.c:1383
+#: mail/folder-browser.c:1418
 msgid "Apply Filters"
 msgstr ""
 
-#: mail/folder-browser.c:1387
+#: mail/folder-browser.c:1422
 msgid "Create Ru_le From Message"
 msgstr ""
 
-#: mail/folder-browser.c:1538
+#: mail/folder-browser.c:1573
 msgid "Filter on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1539
+#: mail/folder-browser.c:1574
 msgid "VFolder on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1541
+#: mail/folder-browser.c:1576
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:1542
+#: mail/folder-browser.c:1577
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr ""
@@ -8286,23 +8375,23 @@ msgstr "Evolution"
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:945
+#: mail/mail-account-gui.c:947
 #, fuzzy
 msgid "Could not save signature file."
 msgstr "Te�p ag fork: %s"
 
-#: mail/mail-account-gui.c:1022
+#: mail/mail-account-gui.c:1024
 msgid "Save signature"
 msgstr ""
 
-#: mail/mail-account-gui.c:1028
+#: mail/mail-account-gui.c:1030
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: mail/mail-account-gui.c:1611
+#: mail/mail-account-gui.c:1615
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -8336,7 +8425,7 @@ msgid "Are you sure you want to delete this news account?"
 msgstr ""
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:757 mail/mail-config.glade.h:42
+#: mail/mail-accounts.c:760 mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Mail Settings"
 msgstr "Post do %s"
@@ -8428,70 +8517,70 @@ msgstr ""
 msgid "This message contains invalid recipients:"
 msgstr ""
 
-#: mail/mail-callbacks.c:453
+#: mail/mail-callbacks.c:454
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:549
+#: mail/mail-callbacks.c:550
 msgid "You must configure an account before you can send this email."
 msgstr ""
 
-#: mail/mail-callbacks.c:779
+#: mail/mail-callbacks.c:783
 #, fuzzy
 msgid "an unknown sender"
 msgstr "iEarraidh gan Aithne"
 
-#: mail/mail-callbacks.c:784
+#: mail/mail-callbacks.c:788
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1162
+#: mail/mail-callbacks.c:1171
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1164
+#: mail/mail-callbacks.c:1173
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1538
+#: mail/mail-callbacks.c:1547
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1560
+#: mail/mail-callbacks.c:1569
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1594
+#: mail/mail-callbacks.c:1603
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1606
+#: mail/mail-callbacks.c:1615
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1627
+#: mail/mail-callbacks.c:1636
 msgid "No Message Selected"
 msgstr ""
 
-#: mail/mail-callbacks.c:1712
+#: mail/mail-callbacks.c:1721
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:1714
+#: mail/mail-callbacks.c:1723
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:1859 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:1868 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Rabhadh"
 
-#: mail/mail-callbacks.c:1864
+#: mail/mail-callbacks.c:1873
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8499,32 +8588,32 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1871
+#: mail/mail-callbacks.c:1880
 msgid "Do not ask me again."
 msgstr ""
 
-#: mail/mail-callbacks.c:1976
+#: mail/mail-callbacks.c:1985
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:1986
+#: mail/mail-callbacks.c:1995
 #, fuzzy
 msgid "Filters"
 msgstr "Comhad"
 
-#: mail/mail-callbacks.c:2032
+#: mail/mail-callbacks.c:2041
 #, fuzzy
 msgid "Print Message"
 msgstr "Post an sce�l seo"
 
-#: mail/mail-callbacks.c:2078
+#: mail/mail-callbacks.c:2087
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-callbacks.c:2162
+#: mail/mail-callbacks.c:2171
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -8570,87 +8659,106 @@ msgstr ""
 msgid "Evolution Account Assistant"
 msgstr ""
 
-#: mail/mail-config.c:1486
-#, fuzzy
-msgid "Evolution Shortcuts"
-msgstr "Evolution"
+#: mail/mail-config.c:315
+#, fuzzy, c-format
+msgid "Account %d"
+msgstr "Ainm Grupa:"
 
-#. right now, the URL always works basically as a matter of luck...
-#. * both IMAP and mbox spool stores have INBOX as their inbox folder
-#. * name. I don't think this will work with maildir. How can we figure out
-#. * what shortcut to insert?
-#.
 #: mail/mail-config.c:1618
 #, c-format
+msgid ""
+"Could not get inbox for new mail store:\n"
+"%s\n"
+"No shortcut will be created."
+msgstr ""
+
+#. Create the shortcut. FIXME: This only works if the
+#. * full name matches the path.
+#.
+#: mail/mail-config.c:1629
+#, c-format
 msgid "%s: Inbox"
 msgstr ""
 
-#: mail/mail-config.c:1851
+#: mail/mail-config.c:1873
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:1922 mail/mail-config.c:1925
+#: mail/mail-config.c:1944 mail/mail-config.c:1947
 msgid "Connecting to server..."
 msgstr ""
 
 #: mail/mail-config.glade.h:1
+msgid " _Check for supported types "
+msgstr ""
+
+#: mail/mail-config.glade.h:2
 msgid " color"
 msgstr " dath"
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr ""
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:5 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:6 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "Accounts"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:10
 msgid "Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:10 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:12
 msgid "Authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:13
 msgid "Authentication Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:14
 msgid "Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:16
 #, fuzzy
 msgid "Composer"
 msgstr "D�n"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:17
+#, fuzzy
+msgid "Configuration"
+msgstr "Eolas"
+
+#: mail/mail-config.glade.h:18
+msgid "Confirm when Expunging a folder"
+msgstr ""
+
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -8660,336 +8768,320 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr "_Gn�th"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:26
 msgid "Default Forward style is: "
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:27
 msgid "Default character encoding: "
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:29
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:30
 msgid "Display"
 msgstr "Taispea�n"
 
-#: mail/mail-config.glade.h:27 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:31 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Cr�ochnaithe"
 
-#: mail/mail-config.glade.h:28 shell/e-local-storage.c:174
+#: mail/mail-config.glade.h:32 shell/e-local-storage.c:174
 msgid "Drafts"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:33
 msgid "Drafts folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:34
 msgid "E_nable"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
-msgid "Each account must have a different name."
-msgstr ""
-
-#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:96
 #: widgets/misc/e-filter-bar.h:103
 #, fuzzy
 msgid "Edit..."
 msgstr "Eagar"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:36
 msgid "Enabled"
 msgstr ""
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:37
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:38
 msgid "HTML signature file:"
 msgstr ""
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:39
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:40 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:41
 msgid "In HTML mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:42
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:43
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:44
 msgid "Mail Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Mailbox location"
 msgstr "Sheoladh Chuig duine"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:47
 msgid "Make this my _default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:45
-msgid "Message _preview should be displayed by default"
-msgstr ""
-
-#: mail/mail-config.glade.h:46
-msgid "Message list should display in a _threaded fashion by default"
-msgstr ""
-
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 msgid "NNTP Server:"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:49
 msgid "News"
 msgstr "_Nuacht"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:51
 msgid "Optional Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:53
 msgid "PGP Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 msgid "Pick a color"
 msgstr "T�g dath"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 msgid "Prompt when sending messages with an _empty subject"
 msgstr ""
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:60
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid "Quoted"
 msgstr "Nota"
 
-#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:63
 msgid "Receiving Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:64
 msgid "Receiving Options"
 msgstr ""
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:65
 msgid "Required Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:67
 msgid "Secure MIME"
 msgstr ""
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:68
 #, fuzzy
 msgid "Security"
 msgstr "_Sl�nd�il"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Select Filter Log file..."
 msgstr "Fillte�n _Nua"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:70
 msgid "Select PGP binary"
 msgstr ""
 
-#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:71 shell/glade/evolution-startup-wizard.glade.h:7
 #, fuzzy
 msgid "Sending Email"
 msgstr "Post"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Sending Mail"
 msgstr "Post"
 
-#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:74 mail/message-list.etspec.h:6
 #: shell/e-local-storage.c:177
 #, fuzzy
 msgid "Sent"
 msgstr "Post"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Post an sce�l seo"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Sent messages folder:"
 msgstr "_Post sce�l"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:77
 msgid "Server Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Server Type: "
 msgstr "Post"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 msgid "Server requires _authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:80
 msgid "Signature file:"
 msgstr ""
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Source"
 msgstr "Sc�r"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "Source Information"
 msgstr "Eolas"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:83
 msgid "Sources"
 msgstr ""
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Special Folders"
 msgstr "_Fillte�n"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:85
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:87
 msgid "Use secure connection (_SSL)"
 msgstr ""
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:88
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:92
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:93
 msgid "_Automatically check for new mail every"
 msgstr ""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:94
 msgid "_Check for supported types"
 msgstr ""
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "_Email Address:"
 msgstr "_Seoladh:"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:98
 msgid "_Empty trash folders on exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 #, fuzzy
 msgid "_Full Name:"
 msgstr "Ainm:"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "_HTML Signature:"
 msgstr ""
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 msgid "_Highlight citations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "_Host:"
 msgstr "�st:"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 msgid "_Log filter actions to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 #, fuzzy
 msgid "_Mark messages as Read after"
 msgstr "Fillte�n _Nua"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 #, fuzzy
 msgid "_Name:"
 msgstr "Ainm:"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 #, fuzzy
 msgid "_Organization:"
 msgstr "Treshu�omh"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:109
 msgid "_PGP binary path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "_Path:"
 msgstr "Sl�"
 
-#: mail/mail-config.glade.h:110
-msgid "_Remember PGP Passphrase until exit"
-msgstr ""
-
 #: mail/mail-config.glade.h:111
 msgid "_Remember this password"
 msgstr ""
@@ -9024,39 +9116,39 @@ msgstr ""
 msgid "seconds."
 msgstr "soicind."
 
-#: mail/mail-crypto.c:60
+#: mail/mail-crypto.c:59
 msgid "Could not create a PGP signature context."
 msgstr ""
 
-#: mail/mail-crypto.c:86
+#: mail/mail-crypto.c:84
 msgid "Could not create a PGP verification context."
 msgstr ""
 
-#: mail/mail-crypto.c:116
+#: mail/mail-crypto.c:113
 msgid "Could not create a PGP encryption context."
 msgstr ""
 
-#: mail/mail-crypto.c:142
+#: mail/mail-crypto.c:138
 msgid "Could not create a PGP decryption context."
 msgstr ""
 
-#: mail/mail-crypto.c:177
+#: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
 msgstr ""
 
-#: mail/mail-crypto.c:209
+#: mail/mail-crypto.c:205
 msgid "Could not create a S/MIME certsonly context."
 msgstr ""
 
-#: mail/mail-crypto.c:240
+#: mail/mail-crypto.c:236
 msgid "Could not create a S/MIME encryption context."
 msgstr ""
 
-#: mail/mail-crypto.c:271
+#: mail/mail-crypto.c:267
 msgid "Could not create a S/MIME envelope context."
 msgstr ""
 
-#: mail/mail-crypto.c:301
+#: mail/mail-crypto.c:297
 msgid "Could not create a S/MIME decode context."
 msgstr ""
 
@@ -9106,12 +9198,12 @@ msgstr ""
 "\n"
 "�iti�l: "
 
-#: mail/mail-display.c:1519
+#: mail/mail-display.c:1520
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "_Post sce�l"
 
-#: mail/mail-display.c:1521
+#: mail/mail-display.c:1523
 #, fuzzy
 msgid "Save Image as..."
 msgstr "S�nbh�il le..."
@@ -9129,138 +9221,138 @@ msgstr ""
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:860
+#: mail/mail-format.c:862
 #, fuzzy
 msgid "Bad Address"
 msgstr "_Seoladh:"
 
-#: mail/mail-format.c:882 mail/message-list.etspec.h:3
+#: mail/mail-format.c:903 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "�:"
 
-#: mail/mail-format.c:885
+#: mail/mail-format.c:906
 #, fuzzy
 msgid "Reply-To"
 msgstr "Freagrair"
 
-#: mail/mail-format.c:888 mail/message-list.etspec.h:10
+#: mail/mail-format.c:910 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Do:"
 
-#: mail/mail-format.c:891
+#: mail/mail-format.c:914
 #, fuzzy
 msgid "Cc"
 msgstr "Cc:"
 
-#: mail/mail-format.c:1311
+#: mail/mail-format.c:1357
 msgid "No GPG/PGP program configured."
 msgstr ""
 
-#: mail/mail-format.c:1327
+#: mail/mail-format.c:1373
 msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-format.c:1338
+#: mail/mail-format.c:1384
 #, fuzzy
 msgid "Encrypted message"
 msgstr "Post an sce�l seo"
 
-#: mail/mail-format.c:1339
+#: mail/mail-format.c:1385
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1394
+#: mail/mail-format.c:1440
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1405
+#: mail/mail-format.c:1451
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2083
+#: mail/mail-format.c:2128
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2097
+#: mail/mail-format.c:2142
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2102
+#: mail/mail-format.c:2147
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2131
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2139
+#: mail/mail-format.c:2184
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2144
+#: mail/mail-format.c:2189
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:547
+#: mail/mail-local.c:563
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "Fillte�n _Nua"
 
-#: mail/mail-local.c:620
+#: mail/mail-local.c:636
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:676
+#: mail/mail-local.c:689
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Te�p ag fork: %s"
 
-#: mail/mail-local.c:722
+#: mail/mail-local.c:735
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:1052
+#: mail/mail-local.c:1075
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1067
+#: mail/mail-local.c:1090
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1089
+#: mail/mail-local.c:1112
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1180
+#: mail/mail-local.c:1200
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-local.c:1190
+#: mail/mail-local.c:1209
 #, fuzzy, c-format
-msgid "Reconfigure %s"
+msgid "Reconfigure /%s"
 msgstr "Cumraigh %s"
 
-#: mail/mail-mt.c:188
+#: mail/mail-mt.c:199
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:191
+#: mail/mail-mt.c:202
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -9268,21 +9360,25 @@ msgid ""
 msgstr ""
 
 #. Remember the password?
-#: mail/mail-mt.c:454
+#: mail/mail-mt.c:509
 msgid "Remember this password"
 msgstr ""
 
-#: mail/mail-mt.c:511
+#: mail/mail-mt.c:510
+msgid "Remember this password for the remainder of this session"
+msgstr ""
+
+#: mail/mail-mt.c:567
 #, fuzzy, c-format
 msgid "Enter Password for %s"
 msgstr "Te�p ag fork: %s"
 
-#: mail/mail-mt.c:514
+#: mail/mail-mt.c:570
 #, fuzzy
 msgid "Enter Password"
 msgstr "Pasfhocal"
 
-#: mail/mail-mt.c:824
+#: mail/mail-mt.c:886
 msgid "Working"
 msgstr ""
 
@@ -9436,6 +9532,11 @@ msgstr ""
 msgid "Disconnecting from %s"
 msgstr ""
 
+#: mail/mail-ops.c:2065
+#, fuzzy, c-format
+msgid "Reconnecting to %s"
+msgstr "Cumraigh %s"
+
 #: mail/mail-search-dialogue.c:113
 msgid "_Search"
 msgstr "C_uardaigh..."
@@ -9498,12 +9599,12 @@ msgstr ""
 msgid "Type: %s"
 msgstr "Saghas:"
 
-#: mail/mail-send-recv.c:282
+#: mail/mail-send-recv.c:283
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "Post"
 
-#: mail/mail-send-recv.c:283
+#: mail/mail-send-recv.c:284
 #, fuzzy
 msgid "Cancel All"
 msgstr "Ag Cealaigh..."
@@ -9524,36 +9625,50 @@ msgstr ""
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-tools.c:173
+#: mail/mail-tools.c:133
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr ""
 
-#: mail/mail-tools.c:299
+#: mail/mail-tools.c:259
 #, c-format
 msgid "Forwarded message - %s"
 msgstr ""
 
-#: mail/mail-tools.c:303
+#: mail/mail-tools.c:263
 #, fuzzy
 msgid "Forwarded message"
 msgstr "Sheoladh Chuig duine"
 
-#: mail/mail-tools.c:439
+#: mail/mail-tools.c:396
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "Post an sce�l seo"
 
-#: mail/mail-vfolder.c:161
+#: mail/mail-vfolder.c:84
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: mail/mail-vfolder.c:435
+#: mail/mail-vfolder.c:201
+#, fuzzy, c-format
+msgid "Updating vfolders for uri: %s"
+msgstr "Ag oscailt an t-eolaire %s"
+
+#: mail/mail-vfolder.c:414
+#, c-format
+msgid ""
+"The following vFolder(s):\n"
+"%sUsed the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+
+#: mail/mail-vfolder.c:636
 msgid "VFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:541
+#: mail/mail-vfolder.c:742
 msgid "New VFolder"
 msgstr "Fillte�n _Nua"
 
@@ -9624,7 +9739,7 @@ msgstr "%a %l:%M %"
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2331
+#: mail/message-list.c:2334
 #, fuzzy
 msgid "Generating message list"
 msgstr "Post an sce�l seo"
@@ -9711,35 +9826,35 @@ msgstr ""
 msgid "Evolution component for the executive summary."
 msgstr ""
 
-#: my-evolution/component-factory.c:30
+#: my-evolution/component-factory.c:45
 msgid "Folder containing the Evolution Summary"
 msgstr ""
 
-#: my-evolution/component-factory.c:139
+#: my-evolution/component-factory.c:154
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:248 my-evolution/e-summary-calendar.c:266
+#: my-evolution/e-summary-calendar.c:263 my-evolution/e-summary-calendar.c:281
 #, fuzzy
 msgid "Appointments"
 msgstr "Coinne"
 
-#: my-evolution/e-summary-calendar.c:249
+#: my-evolution/e-summary-calendar.c:264
 #, fuzzy
 msgid "No appointments"
 msgstr "Taispe�in coinn�"
 
-#: my-evolution/e-summary-calendar.c:286
+#: my-evolution/e-summary-calendar.c:301
 #, fuzzy
 msgid "%k%M %d %B"
 msgstr "%A %d %B"
 
-#: my-evolution/e-summary-calendar.c:288
+#: my-evolution/e-summary-calendar.c:303
 #, fuzzy
 msgid "%l:%M %d %B"
 msgstr "%A %d %B"
 
-#: my-evolution/e-summary-mail.c:115
+#: my-evolution/e-summary-mail.c:130
 msgid "Mail summary"
 msgstr ""
 
@@ -9747,87 +9862,87 @@ msgstr ""
 #. see in My Evolution by default. You can find the list of all
 #. stations and their codes in Evolution sources
 #. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-preferences.c:65
-#: my-evolution/e-summary-weather.c:615
+#: my-evolution/e-summary-preferences.c:80
+#: my-evolution/e-summary-weather.c:630
 msgid "KBOS:ZSAM:EGAA"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:427
+#: my-evolution/e-summary-preferences.c:441
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:449
+#: my-evolution/e-summary-preferences.c:463
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:890
+#: my-evolution/e-summary-preferences.c:929
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:898
+#: my-evolution/e-summary-preferences.c:937
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:902
+#: my-evolution/e-summary-preferences.c:941
 msgid "Name:"
 msgstr "Ainm:"
 
-#: my-evolution/e-summary-preferences.c:1438
+#: my-evolution/e-summary-preferences.c:1486
 msgid "Summary Settings"
 msgstr ""
 
-#: my-evolution/e-summary-rdf.c:277 my-evolution/e-summary-rdf.c:362
-#: my-evolution/e-summary-rdf.c:395
+#: my-evolution/e-summary-rdf.c:297 my-evolution/e-summary-rdf.c:382
+#: my-evolution/e-summary-rdf.c:415
 msgid "Error downloading RDF"
 msgstr ""
 
-#: my-evolution/e-summary-rdf.c:487
+#: my-evolution/e-summary-rdf.c:507
 #, fuzzy
 msgid "News Feed"
 msgstr "_Nuacht"
 
-#: my-evolution/e-summary-tasks.c:216
+#: my-evolution/e-summary-tasks.c:238
 #, fuzzy
 msgid "No tasks"
 msgstr "_Teasc Nua"
 
-#: my-evolution/e-summary-tasks.c:255
+#: my-evolution/e-summary-tasks.c:277
 #, fuzzy
 msgid "(No Description)"
 msgstr "Freagra"
 
-#: my-evolution/e-summary-weather.c:57
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:334
+#: my-evolution/e-summary-weather.c:349
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:524
+#: my-evolution/e-summary-weather.c:539
 #, fuzzy
 msgid "Weather"
 msgstr "Eile"
 
-#: my-evolution/e-summary-weather.c:676
+#: my-evolution/e-summary-weather.c:691
 msgid "Regions"
 msgstr ""
 
-#: my-evolution/e-summary.c:162
+#: my-evolution/e-summary.c:187
 #, fuzzy
 msgid "%A, %B %e %Y"
 msgstr "%A, %d %B %Y"
 
-#: my-evolution/e-summary.c:512 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:568 ui/my-evolution.xml.h:3
 #, fuzzy
 msgid "Print Summary"
 msgstr "Tosa�ocht"
 
-#: my-evolution/e-summary.c:558
+#: my-evolution/e-summary.c:614
 msgid "Printing of Summary failed"
 msgstr ""
 
-#: my-evolution/main.c:52
+#: my-evolution/main.c:67
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr ""
 
@@ -11247,73 +11362,72 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:174
+#: shell/e-shell-folder-commands.c:176
 msgid "Cannot move a folder over itself."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:178
 msgid "Cannot copy a folder over itself."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:190
+#: shell/e-shell-folder-commands.c:192
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:294
+#: shell/e-shell-folder-commands.c:312
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:299
+#: shell/e-shell-folder-commands.c:317
 #, fuzzy
 msgid "Copy folder"
 msgstr "_Fillte�n"
 
-#: shell/e-shell-folder-commands.c:337
+#: shell/e-shell-folder-commands.c:359
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:342
+#: shell/e-shell-folder-commands.c:364
 #, fuzzy
 msgid "Move folder"
 msgstr "S�bh�il 'san _eolaire"
 
-#: shell/e-shell-folder-commands.c:367
+#: shell/e-shell-folder-commands.c:390
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:383
+#: shell/e-shell-folder-commands.c:406
 #, fuzzy, c-format
-msgid "Delete folder '%s'"
-msgstr "Fillte�n _Nua"
+msgid "Delete \"%s\""
+msgstr "Scr�os"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:393
+#: shell/e-shell-folder-commands.c:416
 #, c-format
-msgid "Are you sure you want to remove the '%s' folder?"
+msgid "Are you sure you want to remove the \"%s\" folder?"
 msgstr ""
 
-#. Popup a dialog asking what the user would like to rename
-#. the folder to
-#: shell/e-shell-folder-commands.c:468
+#: shell/e-shell-folder-commands.c:470
+#, fuzzy, c-format
+msgid ""
+"Cannot rename folder:\n"
+"%s"
+msgstr "Te�p ag fork: %s"
+
+#: shell/e-shell-folder-commands.c:503
 #, fuzzy, c-format
-msgid "Rename folder '%s'"
+msgid "Rename the \"%s\" folder to:"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: shell/e-shell-folder-commands.c:472
+#: shell/e-shell-folder-commands.c:506
 #, fuzzy
-msgid "Rename"
-msgstr "Ainm Chomad:"
-
-#. Make, pack the label
-#: shell/e-shell-folder-commands.c:480
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "Ainm Fillte�n:"
+msgid "Rename folder"
+msgstr "Ag oscailt an t-eolaire %s"
 
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
@@ -11347,13 +11461,13 @@ msgstr ""
 msgid "Evolution - Create new folder"
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:99
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:348
+#: shell/e-shell-folder-selection-dialog.c:360
 msgid "New..."
 msgstr "Nua..."
 
@@ -11361,7 +11475,11 @@ msgstr "Nua..."
 msgid "(Untitled)"
 msgstr "(gan tide�l)"
 
-#: shell/e-shell-importer.c:102
+#: shell/e-shell-importer.c:141
+msgid "Choose the type of importer to run"
+msgstr ""
+
+#: shell/e-shell-importer.c:144
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -11370,9 +11488,13 @@ msgid ""
 "to work it out."
 msgstr ""
 
+#: shell/e-shell-importer.c:150
+msgid "Please select the information that you would like to import"
+msgstr ""
+
 #. Importer isn't ready yet.
 #. Wait 5 seconds and try again.
-#: shell/e-shell-importer.c:197
+#: shell/e-shell-importer.c:242
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11380,84 +11502,107 @@ msgid ""
 "Waiting 5 seconds to retry."
 msgstr ""
 
-#: shell/e-shell-importer.c:217 shell/e-shell-importer.c:248
+#: shell/e-shell-importer.c:262 shell/e-shell-importer.c:293
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:351
+#: shell/e-shell-importer.c:396
 #, c-format
 msgid "File %s does not exist"
 msgstr ""
 
-#: shell/e-shell-importer.c:363
+#: shell/e-shell-importer.c:408
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:378
+#: shell/e-shell-importer.c:423
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-importer.c:388
+#: shell/e-shell-importer.c:433
 msgid "Importing"
 msgstr ""
 
-#: shell/e-shell-importer.c:396
+#: shell/e-shell-importer.c:441
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:454
 #, c-format
 msgid "Error starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:428
+#: shell/e-shell-importer.c:473
 #, c-format
 msgid "Error loading %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:490
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:560
 msgid "Automatic"
 msgstr ""
 
-#: shell/e-shell-importer.c:566
+#: shell/e-shell-importer.c:611
 msgid "Filename:"
 msgstr "Ainm Chomad:"
 
-#: shell/e-shell-importer.c:571
+#: shell/e-shell-importer.c:616
 #, fuzzy
 msgid "Select a file"
 msgstr "Fillte�n _Nua"
 
-#: shell/e-shell-importer.c:581
+#: shell/e-shell-importer.c:626
 msgid "File type:"
 msgstr ""
 
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:651
+msgid "Import data and settings from older programs"
+msgstr ""
+
+#: shell/e-shell-importer.c:655
+msgid "Import a single file"
+msgstr ""
+
+#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:582
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:585
+msgid "Starting Intelligent Importers"
+msgstr ""
+
+#: shell/e-shell-importer.c:840 shell/e-shell-startup-wizard.c:703
+#, fuzzy, c-format
+msgid "From %s:"
+msgstr "�:"
+
+#: shell/e-shell-importer.c:1003
 #, fuzzy
 msgid "Select folder"
 msgstr "Fillte�n _Nua"
 
-#: shell/e-shell-importer.c:646
+#: shell/e-shell-importer.c:1004
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:689 shell/importer/intelligent.c:194
+#: shell/e-shell-importer.c:1116 shell/importer/intelligent.c:194
 msgid "Import"
 msgstr ""
 
@@ -11476,74 +11621,68 @@ msgstr ""
 msgid "Cannot initialize the Evolution Mailer Wizard interface"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:582
-msgid ""
-"Please wait...\n"
-"Scanning for existing setups"
-msgstr ""
-
-#: shell/e-shell-startup-wizard.c:585
-msgid "Starting Intelligent Importers"
-msgstr ""
-
-#: shell/e-shell-startup-wizard.c:703
-#, fuzzy, c-format
-msgid "From %s:"
-msgstr "�:"
-
 #: shell/e-shell-startup-wizard.c:745
 msgid ""
 "Please select the information\n"
 "that you would like to import"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:183
+#: shell/e-shell-view-menu.c:201
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:191
+#: shell/e-shell-view-menu.c:209
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:217
+#: shell/e-shell-view-menu.c:235
 #, fuzzy
 msgid "Ximian Evolution"
 msgstr "Evolution"
 
-#: shell/e-shell-view-menu.c:219
+#: shell/e-shell-view-menu.c:237
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "C�ipcheart 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:221
+#: shell/e-shell-view-menu.c:239
 msgid ""
 "Ximian Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
 "within the GNOME desktop environment."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:424
+#: shell/e-shell-view-menu.c:442
 msgid "Go to folder..."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:425
+#: shell/e-shell-view-menu.c:443
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:570
+#: shell/e-shell-view-menu.c:563
 #, fuzzy
 msgid "Create a new shortcut"
 msgstr "Scr�os an sceal seo"
 
-#: shell/e-shell-view-menu.c:571
+#: shell/e-shell-view-menu.c:564
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:685
+#: shell/e-shell-view-menu.c:595
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:603
+#, c-format
+msgid "Error executing %s."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:705
 #, fuzzy
 msgid "Work Online"
 msgstr "Sheoladh Chuig duine"
 
-#: shell/e-shell-view-menu.c:698 shell/e-shell-view-menu.c:711
+#: shell/e-shell-view-menu.c:718 shell/e-shell-view-menu.c:731
 #: ui/evolution.xml.h:30
 msgid "Work Offline"
 msgstr ""
@@ -11552,69 +11691,69 @@ msgstr ""
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:1478
+#: shell/e-shell-view.c:1512
 #, c-format
 msgid "%s (%d)"
 msgstr ""
 
-#: shell/e-shell-view.c:1480
+#: shell/e-shell-view.c:1514
 #, fuzzy
 msgid "(None)"
 msgstr "Ar Bith"
 
-#: shell/e-shell-view.c:1485
+#: shell/e-shell-view.c:1519
 #, fuzzy, c-format
 msgid "%s - Ximian Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1487
+#: shell/e-shell-view.c:1521
 #, fuzzy, c-format
 msgid "%s - Ximian Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell-view.c:1527
+#: shell/e-shell-view.c:1561
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1534
+#: shell/e-shell-view.c:1568
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1540
+#: shell/e-shell-view.c:1574
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:560
+#: shell/e-shell.c:562
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1496
+#: shell/e-shell.c:1488
 #, c-format
 msgid ""
 "Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
 "This probably means that the %s component has crashed."
 msgstr ""
 
-#: shell/e-shell.c:1700 widgets/misc/e-cell-date-edit.c:248
+#: shell/e-shell.c:1692 widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "Ceart go Leor"
 
-#: shell/e-shell.c:1702
+#: shell/e-shell.c:1694
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:1704
+#: shell/e-shell.c:1696
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:1706
+#: shell/e-shell.c:1698
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:1708 shell/e-storage.c:491
+#: shell/e-shell.c:1700 shell/e-storage.c:496
 msgid "Generic error"
 msgstr ""
 
@@ -11742,51 +11881,58 @@ msgstr ""
 msgid "Shortcuts"
 msgstr ""
 
+#: shell/e-storage-set-view.c:645
+#, fuzzy, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr "Te�p ag fork: %s"
+
 #: shell/e-storage.c:182 shell/e-storage.c:188
 msgid "(No name)"
 msgstr "(gan ainm)"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:494
 msgid "No error"
 msgstr "Gan Earraidh"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:498
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:500
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:502
 msgid "I/O error"
 msgstr "Earraigh I/A"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:504
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:506
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:503
+#: shell/e-storage.c:508
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:512
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:514
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:516
 msgid "The specified folder cannot be modified or removed"
 msgstr ""
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:518
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
@@ -11817,6 +11963,10 @@ msgstr "�st:"
 msgid "The following connections are currently active:"
 msgstr ""
 
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr "Ainm Fillte�n:"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 #, fuzzy
 msgid "Folder type:"
@@ -11868,15 +12018,25 @@ msgid "Evolution Importer Assistant"
 msgstr "Evolution"
 
 #: shell/importer/import.glade.h:4
-msgid "Import File (Step 2 of 2)"
-msgstr ""
+#, fuzzy
+msgid "Import File (step 3 of 3)"
+msgstr "Fillte�n _Nua"
 
 #: shell/importer/import.glade.h:5
+msgid "Importer Type (step 1 of 3)"
+msgstr ""
+
+#: shell/importer/import.glade.h:6
 #, fuzzy
-msgid "Select a File (step 1 of 2)"
+msgid "Select Importers (step 2 of 3)"
 msgstr "Fillte�n _Nua"
 
-#: shell/importer/import.glade.h:6
+#: shell/importer/import.glade.h:7
+#, fuzzy
+msgid "Select a File (step 2 of 3)"
+msgstr "Fillte�n _Nua"
+
+#: shell/importer/import.glade.h:8
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of\n"
@@ -12091,13 +12251,6 @@ msgstr ""
 msgid "_Select All"
 msgstr "_T�g Gach Rud"
 
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:44
-#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
-#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:19
-#: ui/my-evolution.xml.h:9
-msgid "_Tools"
-msgstr "_Uirlis�"
-
 #: ui/evolution-calendar.xml.h:2
 msgid "Configure the calendar's settings"
 msgstr ""
@@ -12283,8 +12436,8 @@ 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:49
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:36
 msgid "_File"
 msgstr "_Comhad"
@@ -12305,8 +12458,8 @@ msgstr ""
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:54
-#: ui/evolution-signature-editor.xml.h:11
+#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Save"
 msgstr "_S�bh�il"
 
@@ -12959,6 +13112,11 @@ msgstr "Taispea�n"
 msgid "_Open Message"
 msgstr "_Post sce�l"
 
+#: ui/evolution-mail-message.xml.h:98 ui/evolution.xml.h:49
+#: ui/my-evolution.xml.h:9
+msgid "_Tools"
+msgstr "_Uirlis�"
+
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "D�n an fhuinneog seo"
@@ -12970,8 +13128,8 @@ msgstr "D�n an fhuinneog seo"
 msgid "_Close"
 msgstr "_D�n"
 
-#: ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:48
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:50
 msgid "_View"
 msgstr "_Radharc"
 
@@ -13146,38 +13304,33 @@ msgid "_Cc Field"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:46
-#: ui/evolution-signature-editor.xml.h:6
-msgid "_Debug"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:47
 #, fuzzy
 msgid "_Delete all"
 msgstr "_Scr�os"
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:49
 msgid "_From Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:51
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-signature-editor.xml.h:9
 msgid "_Insert"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:51
 msgid "_Open..."
 msgstr "_Osc�il..."
 
-#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-message-composer.xml.h:52
 #, fuzzy
 msgid "_Reply-To Field"
 msgstr "Freagrair"
 
-#: ui/evolution-message-composer.xml.h:55
+#: ui/evolution-message-composer.xml.h:54
 msgid "_Security"
 msgstr "_Sl�nd�il"
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "C_�idi�"
 
@@ -13319,7 +13472,7 @@ msgid "Exit the program"
 msgstr ""
 
 #: ui/evolution.xml.h:15
-msgid "Import an external file format"
+msgid "Import data from other programs"
 msgstr ""
 
 #: ui/evolution.xml.h:17
@@ -13399,7 +13552,7 @@ msgstr "_Fillte�n"
 
 #: ui/evolution.xml.h:41
 #, fuzzy
-msgid "_Import File..."
+msgid "_Import..."
 msgstr "S�bh�il 'san _fillte�n"
 
 #: ui/evolution.xml.h:42
@@ -13417,18 +13570,23 @@ msgstr "Fillte�n _Nua"
 
 #: ui/evolution.xml.h:45
 #, fuzzy
+msgid "_Pilot Settings..."
+msgstr "Post do %s"
+
+#: ui/evolution.xml.h:46
+#, fuzzy
 msgid "_Rename..."
 msgstr "_Osc�il..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:47
 msgid "_Shortcut"
 msgstr ""
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:48
 msgid "_Shortcut Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:51
 msgid "_Work Offline"
 msgstr ""
 
@@ -13529,11 +13687,11 @@ msgstr "LMCDASD"
 msgid "%B %Y"
 msgstr "%B &Y"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:433
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:439
 msgid "Now"
 msgstr "Anois"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:445
 msgid "Today"
 msgstr "Inni�"
 
@@ -13681,21 +13839,49 @@ msgstr ""
 msgid "The Personal Calendar Server; calendar factory"
 msgstr ""
 
-#: wombat/wombat.c:175
+#: wombat/wombat.c:176
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr ""
 
-#: wombat/wombat.c:187
+#: wombat/wombat.c:188
 msgid "init_corba(): could not initialize GNOME"
 msgstr ""
 
-#: wombat/wombat.c:200
+#: wombat/wombat.c:201
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Cannot open folder: %s: No such folder"
-#~ msgstr "Te�p ag fork: %s"
+#~ msgid "_Calendar Information:"
+#~ msgstr "eolas fheilire"
+
+#, fuzzy
+#~ msgid "before start of appointment"
+#~ msgstr "_Coinne"
+
+#, fuzzy
+#~ msgid "after start of appointment"
+#~ msgstr "_Coinne"
+
+#, fuzzy
+#~ msgid "before end of appointment"
+#~ msgstr "_Coinne"
+
+#, fuzzy
+#~ msgid "Evolution Shortcuts"
+#~ msgstr "Evolution"
+
+#, fuzzy
+#~ msgid "Delete folder '%s'"
+#~ msgstr "Fillte�n _Nua"
+
+#, fuzzy
+#~ msgid "Rename"
+#~ msgstr "Ainm Chomad:"
+
+#, fuzzy
+#~ msgid "_Import File..."
+#~ msgstr "S�bh�il 'san _fillte�n"
 
 #~ msgid "Ok"
 #~ msgstr "Ceart go Leor"
@@ -13866,10 +14052,6 @@ msgstr ""
 #~ msgid "Resend"
 #~ msgstr "Post"
 
-#, fuzzy
-#~ msgid "Copying messages"
-#~ msgstr "_Post sce�l"
-
 #~ msgid "View All"
 #~ msgstr "Taidpe�in Gach Rud"
 
diff --git a/po/gl.po b/po/gl.po
index 2a9ecdaf09..4ca55fd2d6 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2001-09-02 01:16+0200\n"
+"POT-Creation-Date: 2001-10-01 19: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"
@@ -28,11 +28,308 @@ msgstr "F�brica para importar ficheiros VCard a Evolution."
 msgid "Imports VCard files into Evolution."
 msgstr "Importa ficheiros VCard a Evolution."
 
-#: addressbook/backend/ebook/e-card.c:3596
+#: addressbook/backend/ebook/e-card-simple.c:58
+#: addressbook/gui/widgets/e-addressbook-view.c:868
+msgid "File As"
+msgstr "Arquivar coma"
+
+#: addressbook/backend/ebook/e-card-simple.c:59
+msgid "Name"
+msgstr "Nome:"
+
+#: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/gui/widgets/e-addressbook-view.c:870
+msgid "Email"
+msgstr "Correo Electr�nico"
+
+#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/gui/contact-editor/e-contact-editor.c:1609
+msgid "Primary"
+msgstr "Principal"
+
+#: addressbook/backend/ebook/e-card-simple.c:61
+#, fuzzy
+msgid "Prim"
+msgstr "Principal"
+
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/gui/contact-editor/e-contact-editor.c:1594
+#: addressbook/gui/widgets/e-addressbook-view.c:902
+msgid "Assistant"
+msgstr "Asistente"
+
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/gui/contact-editor/e-contact-editor.c:1595
+#: addressbook/gui/contact-editor/e-contact-editor.c:1662
+msgid "Business"
+msgstr "Traballo"
+
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/backend/ebook/e-card-simple.c:68
+#, fuzzy
+msgid "Bus"
+msgstr "Ocupado"
+
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:1598
+msgid "Callback"
+msgstr "Resposta"
+
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/gui/contact-editor/e-contact-editor.c:1600
+msgid "Company"
+msgstr "Compa��a"
+
+#: addressbook/backend/ebook/e-card-simple.c:65
+#, fuzzy
+msgid "Comp"
+msgstr "Copiar"
+
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/contact-editor/e-contact-editor.c:1601
+#: addressbook/gui/contact-editor/e-contact-editor.c:1663
+msgid "Home"
+msgstr "Particular"
+
+#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/gui/widgets/e-addressbook-view.c:877
+msgid "Organization"
+msgstr "Organizaci�n"
+
+#: addressbook/backend/ebook/e-card-simple.c:67
+#, fuzzy
+msgid "Org"
+msgstr ""
+"\n"
+"Org: "
+
+#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+msgid "Mobile"
+msgstr "M�bil"
+
+#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/gui/contact-editor/e-contact-editor.c:1599
+msgid "Car"
+msgstr "Autom�bil"
+
+#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/gui/contact-editor/e-contact-editor.c:1597
+#: addressbook/gui/widgets/e-addressbook-view.c:882
+msgid "Business Fax"
+msgstr "Fax do Traballo"
+
+#: addressbook/backend/ebook/e-card-simple.c:72
+#, fuzzy
+msgid "Bus Fax"
+msgstr "Fax do Traballo"
+
+#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/gui/contact-editor/e-contact-editor.c:1603
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+msgid "Home Fax"
+msgstr "Fax Particular"
+
+#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/gui/contact-editor/e-contact-editor.c:1596
+msgid "Business 2"
+msgstr "Traballo 2"
+
+#: addressbook/backend/ebook/e-card-simple.c:74
+#, fuzzy
+msgid "Bus 2"
+msgstr "Ocupado"
+
+#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/gui/contact-editor/e-contact-editor.c:1602
+msgid "Home 2"
+msgstr "Particular 2"
+
+#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/gui/contact-editor/e-contact-editor.c:1604
+#: addressbook/gui/widgets/e-addressbook-view.c:886
+msgid "ISDN"
+msgstr "RDSI"
+
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/gui/contact-editor/e-contact-editor.c:1606
+#: addressbook/gui/contact-editor/e-contact-editor.c:1664
+#: mail/mail-config.glade.h:52
+msgid "Other"
+msgstr "Outro"
+
+#: addressbook/backend/ebook/e-card-simple.c:78
+#: addressbook/gui/contact-editor/e-contact-editor.c:1607
+#: addressbook/gui/widgets/e-addressbook-view.c:888
+msgid "Other Fax"
+msgstr "Outro Fax"
+
+#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/gui/contact-editor/e-contact-editor.c:1608
+#: addressbook/gui/widgets/e-addressbook-view.c:889
+msgid "Pager"
+msgstr "Buscapersoas"
+
+#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/gui/contact-editor/e-contact-editor.c:1610
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+msgid "Radio"
+msgstr "Radio"
+
+#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/gui/contact-editor/e-contact-editor.c:1611
+#: addressbook/gui/widgets/e-addressbook-view.c:891
+msgid "Telex"
+msgstr "Telex"
+
+#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/gui/widgets/e-addressbook-view.c:892
+msgid "TTY"
+msgstr "TTY"
+
+#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1637
+#: addressbook/gui/widgets/e-addressbook-view.c:894
+msgid "Email 2"
+msgstr "Correo Electr�nico 2"
+
+#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1638
+#: addressbook/gui/widgets/e-addressbook-view.c:895
+msgid "Email 3"
+msgstr "Correo Electr�nico 3"
+
+#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/gui/widgets/e-addressbook-view.c:896
+msgid "Web Site"
+msgstr "Sitio Web"
+
+#: addressbook/backend/ebook/e-card-simple.c:86
+msgid "Url"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/gui/widgets/e-addressbook-view.c:897
+msgid "Department"
+msgstr "Departamento"
+
+#: addressbook/backend/ebook/e-card-simple.c:87
+msgid "Dep"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/gui/widgets/e-addressbook-view.c:898
+msgid "Office"
+msgstr "Oficina"
+
+#: addressbook/backend/ebook/e-card-simple.c:88
+#, fuzzy
+msgid "Off"
+msgstr "Oficina"
+
+#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/gui/widgets/e-addressbook-view.c:899
+msgid "Title"
+msgstr "T�tulo"
+
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.c:900
+msgid "Profession"
+msgstr "Profesi�n"
+
+#: addressbook/backend/ebook/e-card-simple.c:90
+msgid "Prof"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.c:901
+msgid "Manager"
+msgstr "Xestor"
+
+#: addressbook/backend/ebook/e-card-simple.c:91
+#, fuzzy
+msgid "Man"
+msgstr "maio"
+
+#: addressbook/backend/ebook/e-card-simple.c:92
+msgid "Ass"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/widgets/e-addressbook-view.c:903
+msgid "Nickname"
+msgstr "Alcume"
+
+#: addressbook/backend/ebook/e-card-simple.c:93
+#, fuzzy
+msgid "Nick"
+msgstr "Alcume"
+
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/gui/widgets/e-addressbook-view.c:904
+msgid "Spouse"
+msgstr "C�nxuxe"
+
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:905
+msgid "Note"
+msgstr "Nota"
+
+#: addressbook/backend/ebook/e-card-simple.c:96
+#, fuzzy
+msgid "Calendar URI"
+msgstr "Axenda"
+
+#: addressbook/backend/ebook/e-card-simple.c:96
+msgid "CALUri"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/gui/widgets/e-addressbook-view.c:906
+msgid "Free-busy URL"
+msgstr "URL libre-ocupado"
+
+#: addressbook/backend/ebook/e-card-simple.c:97
+msgid "FBUrl"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:98
+#, fuzzy
+msgid "Anniversary"
+msgstr "Ani_versario:"
+
+#: addressbook/backend/ebook/e-card-simple.c:98
+msgid "Anniv"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:99
+#, fuzzy
+msgid "Birth Date"
+msgstr ""
+"\n"
+"Data de Nacemento: "
+
+#: addressbook/backend/ebook/e-card-simple.c:102
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Categor�as"
+
+#: addressbook/backend/ebook/e-card-simple.c:103
+#, fuzzy
+msgid "Family Name"
+msgstr "Nome Completo:"
+
+#: addressbook/backend/ebook/e-card.c:3564
 msgid "Card: "
 msgstr "Tarxeta: "
 
-#: addressbook/backend/ebook/e-card.c:3598
+#: addressbook/backend/ebook/e-card.c:3566
 msgid ""
 "\n"
 "Name: "
@@ -40,7 +337,7 @@ msgstr ""
 "\n"
 "Nome: "
 
-#: addressbook/backend/ebook/e-card.c:3599
+#: addressbook/backend/ebook/e-card.c:3567
 msgid ""
 "\n"
 "  Prefix:     "
@@ -48,7 +345,7 @@ msgstr ""
 "\n"
 "  Prefixo:    "
 
-#: addressbook/backend/ebook/e-card.c:3600
+#: addressbook/backend/ebook/e-card.c:3568
 msgid ""
 "\n"
 "  Given:      "
@@ -56,7 +353,7 @@ msgstr ""
 "\n"
 "  Entregado:      "
 
-#: addressbook/backend/ebook/e-card.c:3601
+#: addressbook/backend/ebook/e-card.c:3569
 msgid ""
 "\n"
 "  Additional: "
@@ -64,7 +361,7 @@ msgstr ""
 "\n"
 "  Adicional: "
 
-#: addressbook/backend/ebook/e-card.c:3602
+#: addressbook/backend/ebook/e-card.c:3570
 msgid ""
 "\n"
 "  Family:     "
@@ -72,7 +369,7 @@ msgstr ""
 "\n"
 "  Familia:     "
 
-#: addressbook/backend/ebook/e-card.c:3603
+#: addressbook/backend/ebook/e-card.c:3571
 msgid ""
 "\n"
 "  Suffix:     "
@@ -80,7 +377,7 @@ msgstr ""
 "\n"
 "  Sufixo:     "
 
-#: addressbook/backend/ebook/e-card.c:3617
+#: addressbook/backend/ebook/e-card.c:3585
 msgid ""
 "\n"
 "Birth Date: "
@@ -88,7 +385,7 @@ msgstr ""
 "\n"
 "Data de Nacemento: "
 
-#: addressbook/backend/ebook/e-card.c:3628
+#: addressbook/backend/ebook/e-card.c:3596
 msgid ""
 "\n"
 "Address:"
@@ -96,7 +393,7 @@ msgstr ""
 "\n"
 "Enderezo:"
 
-#: addressbook/backend/ebook/e-card.c:3630
+#: addressbook/backend/ebook/e-card.c:3598
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -104,7 +401,7 @@ msgstr ""
 "\n"
 "  Apdo. de Correos: "
 
-#: addressbook/backend/ebook/e-card.c:3631
+#: addressbook/backend/ebook/e-card.c:3599
 msgid ""
 "\n"
 "  Ext:         "
@@ -112,7 +409,7 @@ msgstr ""
 "\n"
 "  Ext:         "
 
-#: addressbook/backend/ebook/e-card.c:3632
+#: addressbook/backend/ebook/e-card.c:3600
 msgid ""
 "\n"
 "  Street:      "
@@ -120,7 +417,7 @@ msgstr ""
 "\n"
 "  R�a:         "
 
-#: addressbook/backend/ebook/e-card.c:3633
+#: addressbook/backend/ebook/e-card.c:3601
 msgid ""
 "\n"
 "  City:        "
@@ -128,7 +425,7 @@ msgstr ""
 "\n"
 "  Cidade:      "
 
-#: addressbook/backend/ebook/e-card.c:3634
+#: addressbook/backend/ebook/e-card.c:3602
 msgid ""
 "\n"
 "  Region:      "
@@ -136,7 +433,7 @@ msgstr ""
 "\n"
 "  Rexi�n:      "
 
-#: addressbook/backend/ebook/e-card.c:3635
+#: addressbook/backend/ebook/e-card.c:3603
 msgid ""
 "\n"
 "  Postal Code: "
@@ -144,7 +441,7 @@ msgstr ""
 "\n"
 "  C�digo Postal: "
 
-#: addressbook/backend/ebook/e-card.c:3636
+#: addressbook/backend/ebook/e-card.c:3604
 msgid ""
 "\n"
 "  Country:     "
@@ -152,7 +449,7 @@ msgstr ""
 "\n"
 "  Pa�s:        "
 
-#: addressbook/backend/ebook/e-card.c:3649
+#: addressbook/backend/ebook/e-card.c:3617
 msgid ""
 "\n"
 "Delivery Label: "
@@ -160,7 +457,7 @@ msgstr ""
 "\n"
 "Etiqueta de Entrega: "
 
-#: addressbook/backend/ebook/e-card.c:3661
+#: addressbook/backend/ebook/e-card.c:3629
 msgid ""
 "\n"
 "Telephones:\n"
@@ -168,7 +465,7 @@ msgstr ""
 "\n"
 "Tel�fonos:\n"
 
-#: addressbook/backend/ebook/e-card.c:3664
+#: addressbook/backend/ebook/e-card.c:3632
 msgid ""
 "\n"
 "Telephone:"
@@ -176,7 +473,7 @@ msgstr ""
 "\n"
 "Tel�fono:"
 
-#: addressbook/backend/ebook/e-card.c:3688
+#: addressbook/backend/ebook/e-card.c:3656
 msgid ""
 "\n"
 "E-mail:\n"
@@ -184,7 +481,7 @@ msgstr ""
 "\n"
 "Correo Electr�nico:\n"
 
-#: addressbook/backend/ebook/e-card.c:3691
+#: addressbook/backend/ebook/e-card.c:3659
 msgid ""
 "\n"
 "E-mail:"
@@ -192,7 +489,7 @@ msgstr ""
 "\n"
 "Correo Electr�nico:"
 
-#: addressbook/backend/ebook/e-card.c:3710
+#: addressbook/backend/ebook/e-card.c:3678
 msgid ""
 "\n"
 "Mailer: "
@@ -200,7 +497,7 @@ msgstr ""
 "\n"
 "Cliente de Correo: "
 
-#: addressbook/backend/ebook/e-card.c:3716
+#: addressbook/backend/ebook/e-card.c:3684
 msgid ""
 "\n"
 "Time Zone: "
@@ -208,7 +505,7 @@ msgstr ""
 "\n"
 "Fuso Horario: "
 
-#: addressbook/backend/ebook/e-card.c:3724
+#: addressbook/backend/ebook/e-card.c:3692
 msgid ""
 "\n"
 "Geo Location: "
@@ -216,7 +513,7 @@ msgstr ""
 "\n"
 "Localizaci�n Xeogr�fica: "
 
-#: addressbook/backend/ebook/e-card.c:3728
+#: addressbook/backend/ebook/e-card.c:3696
 msgid ""
 "\n"
 "Business Role: "
@@ -224,7 +521,7 @@ msgstr ""
 "\n"
 "Posto Laboral: "
 
-#: addressbook/backend/ebook/e-card.c:3740
+#: addressbook/backend/ebook/e-card.c:3708
 msgid ""
 "\n"
 "Org: "
@@ -232,7 +529,7 @@ msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card.c:3741
+#: addressbook/backend/ebook/e-card.c:3709
 msgid ""
 "\n"
 "  Name:  "
@@ -240,7 +537,7 @@ msgstr ""
 "\n"
 "  Nome:  "
 
-#: addressbook/backend/ebook/e-card.c:3742
+#: addressbook/backend/ebook/e-card.c:3710
 msgid ""
 "\n"
 "  Unit:  "
@@ -248,7 +545,7 @@ msgstr ""
 "\n"
 "  Unidade:  "
 
-#: addressbook/backend/ebook/e-card.c:3743
+#: addressbook/backend/ebook/e-card.c:3711
 msgid ""
 "\n"
 "  Unit2: "
@@ -256,7 +553,7 @@ msgstr ""
 "\n"
 "  Unidade2: "
 
-#: addressbook/backend/ebook/e-card.c:3744
+#: addressbook/backend/ebook/e-card.c:3712
 msgid ""
 "\n"
 "  Unit3: "
@@ -264,7 +561,7 @@ msgstr ""
 "\n"
 "  Unidade3: "
 
-#: addressbook/backend/ebook/e-card.c:3745
+#: addressbook/backend/ebook/e-card.c:3713
 msgid ""
 "\n"
 "  Unit4: "
@@ -272,7 +569,7 @@ msgstr ""
 "\n"
 "  Unidade4: "
 
-#: addressbook/backend/ebook/e-card.c:3749
+#: addressbook/backend/ebook/e-card.c:3717
 msgid ""
 "\n"
 "Categories: "
@@ -280,7 +577,7 @@ msgstr ""
 "\n"
 "Categor�as: "
 
-#: addressbook/backend/ebook/e-card.c:3750
+#: addressbook/backend/ebook/e-card.c:3718
 msgid ""
 "\n"
 "Comment: "
@@ -298,7 +595,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3763
+#: addressbook/backend/ebook/e-card.c:3731
 msgid ""
 "\n"
 "Unique String: "
@@ -306,7 +603,7 @@ msgstr ""
 "\n"
 "Cadea Exclusiva: "
 
-#: addressbook/backend/ebook/e-card.c:3766
+#: addressbook/backend/ebook/e-card.c:3734
 msgid ""
 "\n"
 "Public Key: "
@@ -314,11 +611,11 @@ msgstr ""
 "\n"
 "Clave P�blica: "
 
-#: addressbook/backend/ebook/e-card.c:4098
+#: addressbook/backend/ebook/e-card.c:4087
 msgid "Multiple VCards"
 msgstr "Varias VCards"
 
-#: addressbook/backend/ebook/e-card.c:4106
+#: addressbook/backend/ebook/e-card.c:4095
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard de %s"
@@ -327,36 +624,95 @@ msgstr "VCard de %s"
 #: 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:1100
+#: addressbook/conduit/address-conduit.c:1167
 #: addressbook/gui/component/addressbook-factory.c:48
-#: calendar/conduits/calendar/calendar-conduit.c:1204
-#: calendar/conduits/todo/todo-conduit.c:1018
-#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
+#: calendar/conduits/calendar/calendar-conduit.c:1262
+#: calendar/conduits/todo/todo-conduit.c:1034
+#: calendar/gui/alarm-notify/notify-main.c:78 calendar/gui/main.c:63
 msgid "Could not initialize Bonobo"
 msgstr "Non foi posible inicializar Bonobo"
 
-#: addressbook/conduit/address-conduit.c:201
+#: addressbook/backend/pas/pas-backend-file.c:257
+#: addressbook/backend/pas/pas-backend-ldap.c:2047
+#, fuzzy
+msgid "Searching..."
+msgstr "Buscar M_ensaxe..."
+
+#: addressbook/backend/pas/pas-backend-file.c:259
+#, fuzzy
+msgid "Loading..."
+msgstr "Agardando..."
+
+#. need a different error message here.
+#: addressbook/backend/pas/pas-backend-file.c:268
+#, 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:467
+#, fuzzy
+msgid "Connecting to LDAP server..."
+msgstr "Conectando ao servidor..."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:477
+#, fuzzy
+msgid "Unable to connect to LDAP server."
+msgstr ""
+"Non foi posible autenticarse co servidor IMAP.\n"
+"%s\n"
+"\n"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:493
+#, fuzzy
+msgid "Waiting for connection to LDAP server..."
+msgstr "Conectando ao servidor..."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:862
+#, fuzzy
+msgid "Adding card to LDAP server..."
+msgstr "Conectando ao servidor..."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:959
+#, fuzzy
+msgid "Removing card from LDAP server..."
+msgstr "Eliminando as tarxetas..."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:1064
+msgid "Modifying card from LDAP server..."
+msgstr ""
+
+#: addressbook/backend/pas/pas-backend-ldap.c:1992
+msgid "Receiving LDAP search results..."
+msgstr ""
+
+#: addressbook/backend/pas/pas-backend-ldap.c:1997
+msgid "Restarting search."
+msgstr ""
+
+#: addressbook/conduit/address-conduit.c:204
 msgid "Cursor could not be loaded\n"
 msgstr "Non foi posible cargar o cursor\n"
 
-#: addressbook/conduit/address-conduit.c:214
+#: addressbook/conduit/address-conduit.c:217
 msgid "EBook not loaded\n"
 msgstr "EBook non cargado\n"
 
-#: addressbook/conduit/address-conduit.c:662
-#: calendar/conduits/calendar/calendar-conduit.c:778
-#: calendar/conduits/todo/todo-conduit.c:592
+#: addressbook/conduit/address-conduit.c:731
+#: calendar/conduits/calendar/calendar-conduit.c:837
+#: calendar/conduits/todo/todo-conduit.c:609
 msgid "Could not start wombat server"
 msgstr "Non foi posible iniciar o servidor wombat"
 
-#: addressbook/conduit/address-conduit.c:663
-#: calendar/conduits/calendar/calendar-conduit.c:779
-#: calendar/conduits/todo/todo-conduit.c:593
+#: addressbook/conduit/address-conduit.c:732
+#: calendar/conduits/calendar/calendar-conduit.c:838
+#: calendar/conduits/todo/todo-conduit.c:610
 msgid "Could not start wombat"
 msgstr "Non foi posible iniciar wombat"
 
-#: addressbook/conduit/address-conduit.c:695
-#: addressbook/conduit/address-conduit.c:698
+#: addressbook/conduit/address-conduit.c:762
+#: addressbook/conduit/address-conduit.c:765
 msgid "Could not read pilot's Address application block"
 msgstr "Non foi posible ler o bloque de aplicaci�n Enderezo do pilot"
 
@@ -397,42 +753,48 @@ msgid "Factory for the Addressbook's address popup"
 msgstr "F�brica para o men� emerxente de enderezos do Libro de Enderezos"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Evolution addressbook component."
-msgstr "F�brica para o compo�ente Libro de Enderezos de Evolution."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the sample Addressbook control"
 msgstr "F�brica para o control de exemplo do Libro de Enderezos"
 
-#: addressbook/gui/component/addressbook-component.c:68
-#: calendar/gui/dialogs/comp-editor-util.c:281
-#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1061
+#: addressbook/gui/component/addressbook-component.c:66
+#: calendar/gui/dialogs/comp-editor-util.c:289
+#: calendar/gui/dialogs/comp-editor-util.c:345 shell/e-local-storage.c:173
+#: shell/e-shortcuts.c:1062
 msgid "Contacts"
 msgstr "Contactos"
 
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:66
 msgid "Folder containing contact information"
 msgstr "Cartafol que cont�n informaci�n de contacto"
 
-#: addressbook/gui/component/addressbook-component.c:386
+#: addressbook/gui/component/addressbook-component.c:68
+#, fuzzy
+msgid "LDAP Server"
+msgstr "Servidor NNTP:"
+
+#: addressbook/gui/component/addressbook-component.c:68
+#, fuzzy
+msgid "LDAP server containing contact information"
+msgstr "Cartafol que cont�n informaci�n de contacto"
+
+#: addressbook/gui/component/addressbook-component.c:411
 #: ui/evolution-addressbook.xml.h:11
 msgid "New Contact"
 msgstr "Novo Contacto"
 
-#: addressbook/gui/component/addressbook-component.c:386
+#: addressbook/gui/component/addressbook-component.c:411
 msgid "New _Contact"
 msgstr "Novo C_ontacto"
 
-#: addressbook/gui/component/addressbook-component.c:387
+#: addressbook/gui/component/addressbook-component.c:412
 msgid "New Contact List"
 msgstr "Nova Lista de Contactos"
 
-#: addressbook/gui/component/addressbook-component.c:387
+#: addressbook/gui/component/addressbook-component.c:412
 msgid "New Contact _List"
 msgstr "Nova _Lista de Contactos"
 
-#: addressbook/gui/component/addressbook-config.c:144
+#: addressbook/gui/component/addressbook-config.c:188
 msgid "Edit Addressbook"
 msgstr "Editar o Libro de Enderezos"
 
@@ -461,7 +823,7 @@ msgid "Base"
 msgstr "Base"
 
 #: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:151
+#: calendar/gui/dialogs/task-editor.c:172
 msgid "Basic"
 msgstr "B�sico"
 
@@ -527,26 +889,29 @@ msgstr "Este e o porto que usa o servidor ldap."
 msgid ""
 "This name will be used to identify your account. It is for display purposes "
 "only."
-msgstr "Este nome hase empregar para identifica-la conta. S� se empregar� para amosar."
+msgstr ""
+"Este nome hase empregar para identifica-la conta. S� se empregar� para "
+"amosar."
 
 #: addressbook/gui/component/addressbook-config.glade.h:21
 msgid "_Account name:"
 msgstr "Nome da Cont_a:"
 
 #: addressbook/gui/component/addressbook-config.glade.h:22
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:18
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
+#: mail/mail-config.glade.h:91 my-evolution/my-evolution.glade.h:20
 msgid "_Add"
 msgstr "_Engadir"
 
 #: addressbook/gui/component/addressbook-config.glade.h:23
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:95
-#: ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution.xml.h:36
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:96
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
+#: 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:6 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
 msgstr "_Editar"
 
@@ -562,32 +927,32 @@ msgstr "_Porto:"
 msgid "_Server name:"
 msgstr "Nome do _Servidor:"
 
-#: addressbook/gui/component/addressbook-storage.c:140
+#: addressbook/gui/component/addressbook-storage.c:163
 msgid "Other Contacts"
 msgstr "Outros Contactos"
 
-#: addressbook/gui/component/addressbook.c:386
+#: addressbook/gui/component/addressbook.c:407
 #, c-format
 msgid "Please enter your email address and password for access to %s"
 msgstr "Introduza o seu enderezo de correo e contrasinal de acceso a %s"
 
-#: addressbook/gui/component/addressbook.c:394
+#: addressbook/gui/component/addressbook.c:415
 msgid "LDAP Authentication"
 msgstr "Autenticaci�n LDAP"
 
-#: addressbook/gui/component/addressbook.c:405
+#: addressbook/gui/component/addressbook.c:426
 msgid "Email Address:"
 msgstr "Enderezo de Correo:"
 
-#: addressbook/gui/component/addressbook.c:418
+#: addressbook/gui/component/addressbook.c:439
 msgid "Password:"
 msgstr "Contrasinal:"
 
-#: addressbook/gui/component/addressbook.c:481
+#: addressbook/gui/component/addressbook.c:502
 msgid "Unable to open addressbook"
 msgstr "Non se pode abrir o libro de enderezos"
 
-#: addressbook/gui/component/addressbook.c:488
+#: addressbook/gui/component/addressbook.c:509
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -597,7 +962,7 @@ msgstr ""
 "que introduciu un URI incorrecto ou que o servidor LDAP est�\n"
 "f�ra de servicio"
 
-#: addressbook/gui/component/addressbook.c:493
+#: addressbook/gui/component/addressbook.c:514
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -609,7 +974,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:501
+#: addressbook/gui/component/addressbook.c:522
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -617,37 +982,37 @@ 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:642
+#: addressbook/gui/component/addressbook.c:663
 #: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "Calquera campo cont�n"
 
-#: addressbook/gui/component/addressbook.c:643
+#: addressbook/gui/component/addressbook.c:664
 msgid "Name contains"
 msgstr "O nome cont�n"
 
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:665
 msgid "Email contains"
 msgstr "Enderezo cont�n"
 
-#: addressbook/gui/component/addressbook.c:645
+#: addressbook/gui/component/addressbook.c:666
 #: calendar/gui/cal-search-bar.c:59
 msgid "Category is"
 msgstr "A categor�a �"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:646 widgets/misc/e-filter-bar.h:97
+#: addressbook/gui/component/addressbook.c:667 widgets/misc/e-filter-bar.h:97
 #: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "Avanzado..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:874
+#: addressbook/gui/component/addressbook.c:897
 #: calendar/gui/cal-search-bar.c:412
 msgid "Any Category"
 msgstr "Calquera Categor�a"
 
-#: addressbook/gui/component/addressbook.c:912
+#: addressbook/gui/component/addressbook.c:939
 msgid "The URI that the Folder Browser will display"
 msgstr "O URI que ha amosar o Navegador de Cartafoles"
 
@@ -661,23 +1026,11 @@ msgid "(none)"
 msgstr "(ning�n)"
 
 #: addressbook/gui/component/e-address-popup.c:466
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: addressbook/gui/contact-editor/e-contact-editor.c:1603
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/e-contact-editor.c:1636
 msgid "Primary Email"
 msgstr "Correo Electr�nico Principal"
 
-#: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1604
-#: addressbook/gui/widgets/e-addressbook-view.c:860
-msgid "Email 2"
-msgstr "Correo Electr�nico 2"
-
-#: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1605
-#: addressbook/gui/widgets/e-addressbook-view.c:861
-msgid "Email 3"
-msgstr "Correo Electr�nico 3"
-
 #: addressbook/gui/component/e-address-popup.c:579
 msgid "Select an Action"
 msgstr "Escolla unha Acci�n"
@@ -698,13 +1051,13 @@ msgstr "Buscando no Libro de Enderezos..."
 
 #: addressbook/gui/component/e-address-popup.c:934
 #: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:310
+#: addressbook/gui/component/select-names/e-select-names-popup.c:307
 msgid "Edit Contact Info"
 msgstr "Editar Informaci�n de Contacto"
 
 #: addressbook/gui/component/e-address-popup.c:963
 #: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:383
+#: addressbook/gui/component/select-names/e-select-names-popup.c:486
 msgid "Add to Contacts"
 msgstr "Engadir a Contactos"
 
@@ -730,31 +1083,50 @@ msgstr ""
 "F�brica para a interface de selecci�n de nome do Libro de Enderezos de "
 "Evolution"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:156
-#: addressbook/gui/component/select-names/e-select-names.c:729
-#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
-#: filter/filter-rule.c:543 shell/e-shortcuts-view.c:179
+#: addressbook/gui/component/select-names/e-select-names-popup.c:164
+#: addressbook/gui/component/select-names/e-select-names.c:764
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:436
+#: filter/filter-rule.c:613 shell/e-shortcuts-view.c:181
 msgid "Remove"
 msgstr "Eliminar"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+#: addressbook/gui/component/select-names/e-select-names-popup.c:179
 msgid "Remove All"
 msgstr "Eliminar Todos"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+#: addressbook/gui/component/select-names/e-select-names-popup.c:203
 msgid "Send HTML Mail?"
 msgstr "�Enviar Correo HTML?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:368
+#: addressbook/gui/component/select-names/e-select-names-popup.c:406
+#, fuzzy
+msgid "Edit Contact List"
+msgstr "Lista de _Contactos"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:424
+#, fuzzy
+msgid "Unnamed Contact List"
+msgstr "Contacto Sen Nome"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:441
+#, c-format
+msgid "(%d not shown)"
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:507
 msgid "Unnamed Contact"
 msgstr "Contacto Sen Nome"
 
-#: addressbook/gui/component/select-names/e-select-names.c:487
-msgid "Unable to get local storage.  This should never happen."
+#: addressbook/gui/component/select-names/e-select-names.c:521
+msgid ""
+"Evolution is unable to get the addressbook local storage. This may have been "
+"caused by the evolution-addressbook component crashing. To help us better "
+"understand and ultimately resolve this problem, please send an e-mail to Jon "
+"Trowbridge <trow@ximian.com> with a detailed description of the "
+"circumstances under which this error occurred.  Thank you."
 msgstr ""
-"Non foi posible obter armacenamento local. Isto nunca debeu ter pasado."
 
-#: addressbook/gui/component/select-names/e-select-names.c:560
+#: addressbook/gui/component/select-names/e-select-names.c:598
 msgid "Select Contacts from Addressbook"
 msgstr "Seleccionar Contactos do Libro de Enderezos"
 
@@ -809,118 +1181,141 @@ msgid "Ca_tegories..."
 msgstr "Ca_tegor�as..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
+msgid "Collaboration"
+msgstr ""
+
+#. Construct the app
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: addressbook/gui/contact-editor/e-contact-editor.c:1241
 msgid "Contact Editor"
 msgstr "Editor de Contactos"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor.c:156
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: calendar/gui/dialogs/task-editor.c:177
 msgid "Details"
 msgstr "Detalles"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#, fuzzy
+msgid "F_ree/Busy URL:"
+msgstr "URL libre-ocupado"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "File A_s:"
 msgstr "Ar_quivar coma:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "General"
 msgstr "Xeral"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+msgid ""
+"If this person publishes free/busy or other calendar information on the "
+"Internet, enter the address\n"
+"of that information here."
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "New phone type"
 msgstr "Novo tipo de tel�fono"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "No_tes:"
 msgstr "No_tas:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Organi_zation:"
 msgstr "Organi_zaci�n:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "Phone Types"
 msgstr "Tipos de Tel�fono"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "Wants to receive _HTML mail"
 msgstr "Quere recibir correo en _HTML"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Address..."
 msgstr "_Enderezo..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "_Assistant's name:"
 msgstr "Nome do _asistente:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Birthday:"
 msgstr "_Aniversario:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Business"
 msgstr "_Traballo"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 #: calendar/gui/dialogs/event-page.glade.h:12
 #: calendar/gui/dialogs/task-page.glade.h:10
 msgid "_Contacts..."
 msgstr "_Contactos..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-#: calendar/gui/dialogs/meeting-page.c:1476 filter/filter.glade.h:8
-#: mail/folder-browser.c:1318 mail/mail-config.glade.h:94
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/meeting-page.c:834 filter/filter.glade.h:8
+#: mail/folder-browser.c:1406 mail/mail-config.glade.h:95
 #: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "_Borrar"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Department:"
 msgstr "_Departamento:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Full Name..."
 msgstr "Nome _Completo..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Home"
 msgstr "_Particular"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Job title:"
 msgstr "_Posto de traballo:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Manager's Name:"
 msgstr "Nome do _Administrador:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Mobile"
 msgstr "_M�bil"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Nickname:"
 msgstr "_Alcume:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Office:"
 msgstr "_Oficina:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Profession:"
 msgstr "_Profesi�n:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#, fuzzy
+msgid "_Public Calendar URL:"
+msgstr "Imprimir Axenda"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Spouse:"
 msgstr "_C�nxuxe:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_This is the mailing address"
 msgstr "_Este � o enderezo de correo"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Web page address:"
 msgstr "Enderezo da p�xina _Web:"
 
@@ -936,117 +1331,33 @@ msgstr ""
 msgid "Delete Contact?"
 msgstr "�Borrar Contacto?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:730
+#: addressbook/gui/contact-editor/e-contact-editor.c:759
 msgid "This contact belongs to these categories:"
 msgstr "Este contacto pertence a estas categor�as:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1561
-#: addressbook/gui/widgets/e-addressbook-view.c:868
-msgid "Assistant"
-msgstr "Asistente"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1562
-#: addressbook/gui/contact-editor/e-contact-editor.c:1629
-msgid "Business"
-msgstr "Traballo"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1563
-msgid "Business 2"
-msgstr "Traballo 2"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1564
-#: addressbook/gui/widgets/e-addressbook-view.c:848
-msgid "Business Fax"
-msgstr "Fax do Traballo"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1565
-msgid "Callback"
-msgstr "Resposta"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1566
-msgid "Car"
-msgstr "Autom�bil"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1567
-msgid "Company"
-msgstr "Compa��a"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1568
-#: addressbook/gui/contact-editor/e-contact-editor.c:1630
-msgid "Home"
-msgstr "Particular"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1569
-msgid "Home 2"
-msgstr "Particular 2"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1570
-#: addressbook/gui/widgets/e-addressbook-view.c:849
-msgid "Home Fax"
-msgstr "Fax Particular"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1571
-#: addressbook/gui/widgets/e-addressbook-view.c:852
-msgid "ISDN"
-msgstr "RDSI"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1572
-msgid "Mobile"
-msgstr "M�bil"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1573
-#: addressbook/gui/contact-editor/e-contact-editor.c:1631
-#: mail/mail-config.glade.h:51
-msgid "Other"
-msgstr "Outro"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1574
-#: addressbook/gui/widgets/e-addressbook-view.c:854
-msgid "Other Fax"
-msgstr "Outro Fax"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1575
-#: addressbook/gui/widgets/e-addressbook-view.c:855
-msgid "Pager"
-msgstr "Buscapersoas"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1576
-msgid "Primary"
-msgstr "Principal"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1577
-#: addressbook/gui/widgets/e-addressbook-view.c:856
-msgid "Radio"
-msgstr "Radio"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1578
-#: addressbook/gui/widgets/e-addressbook-view.c:857
-msgid "Telex"
-msgstr "Telex"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1579
+#: addressbook/gui/contact-editor/e-contact-editor.c:1612
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2198
+#: addressbook/gui/contact-editor/e-contact-editor.c:2234
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Non se puido atopa-lo control dun campo: `%s'"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:284
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
 msgid "Contact Quick-Add"
 msgstr "Engadir Contacto Rapidamente"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:286
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:285
 msgid "Edit Full"
 msgstr "Editar Completo"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:312
-#: addressbook/gui/widgets/e-addressbook-view.c:835
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Full Name"
 msgstr "Nome Completo:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:318
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
 msgid "E-mail"
 msgstr "Correo Electr�nico"
 
@@ -2173,114 +2484,6 @@ msgstr "Busca Avanzada"
 msgid "Search"
 msgstr "Buscar"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
-msgid "123"
-msgstr "123"
-
-#: addressbook/gui/widgets/alphabet.glade.h:2
-msgid "a"
-msgstr "a"
-
-#: addressbook/gui/widgets/alphabet.glade.h:3
-msgid "b"
-msgstr "b"
-
-#: addressbook/gui/widgets/alphabet.glade.h:4
-msgid "c"
-msgstr "c"
-
-#: addressbook/gui/widgets/alphabet.glade.h:5
-msgid "d"
-msgstr "d"
-
-#: addressbook/gui/widgets/alphabet.glade.h:6
-msgid "e"
-msgstr "e"
-
-#: addressbook/gui/widgets/alphabet.glade.h:7
-msgid "f"
-msgstr "f"
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
-msgid "g"
-msgstr "g"
-
-#: addressbook/gui/widgets/alphabet.glade.h:9
-msgid "h"
-msgstr "h"
-
-#: addressbook/gui/widgets/alphabet.glade.h:10
-msgid "i"
-msgstr "i"
-
-#: addressbook/gui/widgets/alphabet.glade.h:11
-msgid "j"
-msgstr "j"
-
-#: addressbook/gui/widgets/alphabet.glade.h:12
-msgid "k"
-msgstr "k"
-
-#: addressbook/gui/widgets/alphabet.glade.h:13
-msgid "l"
-msgstr "l"
-
-#: addressbook/gui/widgets/alphabet.glade.h:14
-msgid "m"
-msgstr "m"
-
-#: addressbook/gui/widgets/alphabet.glade.h:15
-msgid "n"
-msgstr "n"
-
-#: addressbook/gui/widgets/alphabet.glade.h:16
-msgid "o"
-msgstr "o"
-
-#: addressbook/gui/widgets/alphabet.glade.h:17
-msgid "p"
-msgstr "p"
-
-#: addressbook/gui/widgets/alphabet.glade.h:18
-msgid "q"
-msgstr "q"
-
-#: addressbook/gui/widgets/alphabet.glade.h:19
-msgid "r"
-msgstr "r"
-
-#: addressbook/gui/widgets/alphabet.glade.h:20
-msgid "s"
-msgstr "s"
-
-#: addressbook/gui/widgets/alphabet.glade.h:21
-msgid "t"
-msgstr "t"
-
-#: addressbook/gui/widgets/alphabet.glade.h:22
-msgid "u"
-msgstr "u"
-
-#: addressbook/gui/widgets/alphabet.glade.h:23
-msgid "v"
-msgstr "v"
-
-#: addressbook/gui/widgets/alphabet.glade.h:24
-msgid "w"
-msgstr "w"
-
-#: addressbook/gui/widgets/alphabet.glade.h:25
-msgid "x"
-msgstr "x"
-
-#: addressbook/gui/widgets/alphabet.glade.h:26
-msgid "y"
-msgstr "y"
-
-#: addressbook/gui/widgets/alphabet.glade.h:27
-msgid "z"
-msgstr "z"
-
 #: addressbook/gui/widgets/e-addressbook-model.c:121
 msgid "No cards"
 msgstr "Sen tarxetas"
@@ -2296,9 +2499,9 @@ msgstr "%d tarxetas"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:138
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
-#: addressbook/gui/widgets/e-addressbook-view.c:655
-#: addressbook/gui/widgets/e-addressbook-view.c:717
-#: addressbook/gui/widgets/e-addressbook-view.c:1345
+#: addressbook/gui/widgets/e-addressbook-view.c:691
+#: addressbook/gui/widgets/e-addressbook-view.c:753
+#: addressbook/gui/widgets/e-addressbook-view.c:1422
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Gardar como VCard"
@@ -2309,18 +2512,18 @@ msgid "Open"
 msgstr "Abrir"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/widgets/e-addressbook-view.c:754
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Remitir Contacto"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:719
+#: addressbook/gui/widgets/e-addressbook-view.c:755
 msgid "Send Message to Contact"
 msgstr "Enviar unha Mensaxe a un Contacto"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: addressbook/gui/widgets/e-addressbook-view.c:756
 #: 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:63
 #: ui/my-evolution.xml.h:2
@@ -2328,13 +2531,13 @@ msgid "Print"
 msgstr "Imprimir"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:272
-#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/widgets/e-addressbook-view.c:758
 msgid "Print Envelope"
 msgstr "Imprimir Sobre"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:274
-#: addressbook/gui/widgets/e-addressbook-view.c:724 filter/libfilter-i18n.h:8
-#: mail/mail-accounts.c:282 ui/evolution-addressbook.xml.h:8
+#: addressbook/gui/widgets/e-addressbook-view.c:760 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:281 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:16
 #: ui/evolution-tasks.xml.h:8
@@ -2352,8 +2555,8 @@ msgid "Success"
 msgstr "�xito"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1652
-#: shell/e-storage.c:515
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1702
+#: shell/e-storage.c:520
 msgid "Unknown error"
 msgstr "Erro desco�ecido"
 
@@ -2361,7 +2564,7 @@ msgstr "Erro desco�ecido"
 msgid "Repository offline"
 msgstr "Repositorio desconectado"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:505
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:510
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
@@ -2378,10 +2581,10 @@ msgid "Protocol not supported"
 msgstr "Protocolo non soportado"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:689 calendar/gui/calendar-model.c:1198
+#: calendar/gui/calendar-model.c:726 calendar/gui/calendar-model.c:1247
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:545
-#: camel/camel-service.c:581
+#: calendar/gui/e-calendar-table.c:461 camel/camel-service.c:598
+#: camel/camel-service.c:634
 msgid "Cancelled"
 msgstr "Cancelada"
 
@@ -2406,134 +2609,85 @@ msgid "Error removing list"
 msgstr "Erro ao elimina-la lista"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1218
+#: addressbook/gui/widgets/e-addressbook-view.c:1297
 msgid "Error removing card"
 msgstr "Erro ao elimina-la tarxeta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:833
-msgid "* Click here to add a contact *"
-msgstr "* Prema aqu� para engadir un contacto *"
+#. Translators: put here a list of labels you want to see on buttons in
+#. addressbook. You may use any character to separate labels but it must
+#. also be placed at the begining ot the string
+#: addressbook/gui/widgets/e-addressbook-view.c:399
+msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:834
-msgid "File As"
-msgstr "Arquivar coma"
+#. Translators: put here a list of characters that correspond to buttons
+#. in addressbook. You may use any character to separate labels but it
+#. must also be placed at the begining ot the string.
+#. Use lower case letters if possible.
+#: addressbook/gui/widgets/e-addressbook-view.c:404
+msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:836
-msgid "Email"
-msgstr "Correo Electr�nico"
+#: addressbook/gui/widgets/e-addressbook-view.c:867
+msgid "* Click here to add a contact *"
+msgstr "* Prema aqu� para engadir un contacto *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:837
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Primary Phone"
 msgstr "Tel�fono Principal"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:838
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Assistant Phone"
 msgstr "Tel�fono do Asistente"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:839
+#: addressbook/gui/widgets/e-addressbook-view.c:873
 msgid "Business Phone"
 msgstr "Tel�fono do Traballo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:840
+#: addressbook/gui/widgets/e-addressbook-view.c:874
 msgid "Callback Phone"
 msgstr "Tel�fono de Resposta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:841
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 msgid "Company Phone"
 msgstr "Tel�fono da Compa��a"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:842
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Home Phone"
 msgstr "Tel�fono Particular"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:843
-msgid "Organization"
-msgstr "Organizaci�n"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:844
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "Business Address"
 msgstr "Enderezo do Traballo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:845
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 msgid "Home Address"
 msgstr "Enderezo Particular"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:846
+#: addressbook/gui/widgets/e-addressbook-view.c:880
 msgid "Mobile Phone"
 msgstr "Tel�fono M�bil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:847
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Car Phone"
 msgstr "Tel�fono do Autom�bil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 msgid "Business Phone 2"
 msgstr "Tel�fono do Traballo 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:851
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 msgid "Home Phone 2"
 msgstr "Particular 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:853
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "Other Phone"
 msgstr "Outro Tel�fono"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:858
-msgid "TTY"
-msgstr "TTY"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:859
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 msgid "Other Address"
 msgstr "Outro Enderezo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:862
-msgid "Web Site"
-msgstr "Sitio Web"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:863
-msgid "Department"
-msgstr "Departamento"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:864
-msgid "Office"
-msgstr "Oficina"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:865
-msgid "Title"
-msgstr "T�tulo"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:866
-msgid "Profession"
-msgstr "Profesi�n"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:867
-msgid "Manager"
-msgstr "Xestor"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:869
-msgid "Nickname"
-msgstr "Alcume"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:870
-msgid "Spouse"
-msgstr "C�nxuxe"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:871
-msgid "Note"
-msgstr "Nota"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:872
-msgid "Free-busy URL"
-msgstr "URL libre-ocupado"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1215
-msgid "Done."
-msgstr "Feito."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1247
-msgid "Removing cards..."
-msgstr "Eliminando as tarxetas..."
-
 #: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr "Gardar no libro de enderezos"
@@ -2728,8 +2882,8 @@ msgstr "_Fonte..."
 msgid "Print cards"
 msgstr "Imprimir tarxetas"
 
-#: addressbook/printing/e-contact-print.c:1112
-#: addressbook/printing/e-contact-print.c:1134
+#: addressbook/printing/e-contact-print.c:1152
+#: addressbook/printing/e-contact-print.c:1174
 msgid "Print card"
 msgstr "Imprimir tarxeta"
 
@@ -2738,18 +2892,44 @@ msgstr "Imprimir tarxeta"
 msgid "Print envelope"
 msgstr "Imprimir sobre"
 
-#: calendar/conduits/calendar/calendar-conduit.c:735
-#: calendar/conduits/todo/todo-conduit.c:548
+#: calendar/cal-util/cal-util.c:418 calendar/cal-util/cal-util.c:440
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:385 mail/message-list.c:652
+msgid "High"
+msgstr "Alta"
+
+#: calendar/cal-util/cal-util.c:420 calendar/cal-util/cal-util.c:442
+#: calendar/gui/calendar-model.c:1673
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:386 mail/message-list.c:651
+msgid "Normal"
+msgstr "Normal"
+
+#: calendar/cal-util/cal-util.c:422 calendar/cal-util/cal-util.c:444
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:387 mail/message-list.c:650
+msgid "Low"
+msgstr "Baixa"
+
+#. An empty string is the same as 'None'.
+#: calendar/cal-util/cal-util.c:438
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:388
+msgid "Undefined"
+msgstr "Indefinida"
+
+#: calendar/conduits/calendar/calendar-conduit.c:793
+#: calendar/conduits/todo/todo-conduit.c:564
 msgid "Error while communicating with calendar server"
 msgstr "Erro ao se comunicar co servidor de axenda"
 
-#: calendar/conduits/calendar/calendar-conduit.c:839
-#: calendar/conduits/calendar/calendar-conduit.c:842
+#: calendar/conduits/calendar/calendar-conduit.c:896
+#: calendar/conduits/calendar/calendar-conduit.c:899
 msgid "Could not read pilot's Calendar application block"
 msgstr "Non foi posible ler o bloque de aplicaci�n da Axenda do pilot"
 
-#: calendar/conduits/todo/todo-conduit.c:653
-#: calendar/conduits/todo/todo-conduit.c:656
+#: calendar/conduits/todo/todo-conduit.c:668
+#: calendar/conduits/todo/todo-conduit.c:671
 msgid "Could not read pilot's ToDo application block"
 msgstr "Non foi posible ler o bloque de aplicaci�n ToDo (PorFacer) do pilot"
 
@@ -2774,21 +2954,22 @@ msgid "Factory for the Calendar Summary component."
 msgstr "F�brica para o compo�ente Resume da Axenda."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the Evolution calendar component."
-msgstr "F�brica para o compo�ente da axenda de Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Factory for the calendar iTip view control"
 msgstr "F�brica para o control vista iTip da axenda"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Factory for the sample Calendar control"
 msgstr "F�brica para o control Axenda de exemplo"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "F�brica para centraliza-los di�logos editores de compo�entes da axenda"
 
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#, fuzzy
+msgid "Factory to create a component editor factory"
+msgstr "F�brica para centraliza-los di�logos editores de compo�entes da axenda"
+
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
 msgstr "Servicio de notificaci�n de alarma"
@@ -2797,45 +2978,45 @@ msgstr "Servicio de notificaci�n de alarma"
 msgid "Factory for the alarm notification service"
 msgstr "F�bica para o servicio de notificaci�n de alarmas"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:152
 #, c-format
 msgid "Notification about your appointment starting on %s and ending on %s"
 msgstr "Notificaci�n da s�a cita que comeza o %s e remata o %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:156
 #, c-format
 msgid "Notification about your appointment starting on %s"
 msgstr "Notificaci�n da s�a cita que comeza o %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:161
 #, c-format
 msgid "Notification about your appointment ending on %s"
 msgstr "Notificaci�n da s�a cita que remata o %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:165
 msgid "Notification about your appointment"
 msgstr "Notificaci�n da s�a cita"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:172
 #, c-format
 msgid "Notification about your task starting on %s and ending on %s"
 msgstr "Notificaci�n da s�a tarefa que comeza o %s e remata o %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:176
 #, c-format
 msgid "Notification about your task starting on %s"
 msgstr "Notificaci�n da s�a tarefa que comeza o %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:181
 #, c-format
 msgid "Notification about your task ending on %s"
 msgstr "Notificaci�n da s�a tarefa que remata o %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:185
 msgid "Notification about your task"
 msgstr "Notificaci�n da s�a tarefa"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:267
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "Alarma o %A, %d de %b de %Y, %H:%M"
 
@@ -2856,177 +3037,149 @@ msgstr "Tempo de adiamento (minutos)"
 msgid "_Edit appointment"
 msgstr "_Editar cita"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:556
+#: calendar/gui/alarm-notify/alarm-queue.c:629
 msgid "No description available."
 msgstr "Non hai unha descrici�n dispo�ible."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:775
-#: calendar/gui/alarm-notify/alarm-queue.c:1074
-#: calendar/gui/alarm-notify/alarm-queue.c:1130
-msgid "Reminder of your appointment at "
-msgstr "Recordatorio da cita en "
-
-#: calendar/gui/alarm-notify/alarm-queue.c:1066
-msgid "Snooze"
-msgstr "Adiar"
-
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:1079
-#: calendar/gui/alarm-notify/alarm-queue.c:1134
-msgid "Ok"
-msgstr "Aceptar"
+#: calendar/gui/alarm-notify/alarm-queue.c:689
+msgid ""
+"Evolution does not support calendar reminders with\n"
+"email notifications yet, but this reminder was\n"
+"configured to send an email.  Evolution will display\n"
+"a normal reminder dialog box instead."
+msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:58
+#: calendar/gui/alarm-notify/alarm-queue.c:740
 #, c-format
 msgid ""
-"It is %s.  The Unix time is %ld right now.  We just thought you may like to "
-"know."
-msgstr "Son as %s. O tempo Unix � agora %ld. Pensamos que lle gostar�a sabelo."
+"An Evolution Calendar reminder is about to trigger.\n"
+"This reminder is configured to run the following program:\n"
+"\n"
+"        %s\n"
+"\n"
+"Are you sure you want to run this program?"
+msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
+#: calendar/gui/alarm-notify/notify-main.c:73 calendar/gui/main.c:58
 msgid "Could not initialize GNOME"
 msgstr "Non foi posible inicializar GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:72
+#: calendar/gui/alarm-notify/notify-main.c:81 calendar/gui/main.c:106
 msgid "Could not initialize gnome-vfs"
 msgstr "Non foi posible inicializar gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:115
+#: calendar/gui/alarm-notify/notify-main.c:90
 msgid "Could not create the alarm notify service factory"
 msgstr "Non foi posible crear a f�brica do servicio de notificaci�ns de alarma"
 
-#: calendar/gui/calendar-commands.c:414
+#: calendar/gui/calendar-commands.c:439
 msgid "%A %d %B %Y"
 msgstr "%A, %d de %B de %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:417 calendar/gui/e-day-view-top-item.c:289
-#: calendar/gui/e-day-view.c:1368 calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/calendar-commands.c:442 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1388 calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:419 calendar/gui/calendar-commands.c:424
-#: calendar/gui/calendar-commands.c:426
+#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-commands.c:449
+#: calendar/gui/calendar-commands.c:451
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:435
-#, c-format
-msgid "%d"
-msgstr "%d"
-
-#: calendar/gui/calendar-commands.c:437 calendar/gui/calendar-commands.c:444
-#: calendar/gui/calendar-commands.c:450 calendar/gui/calendar-commands.c:452
+#: calendar/gui/calendar-commands.c:462 calendar/gui/calendar-commands.c:469
+#: calendar/gui/calendar-commands.c:475 calendar/gui/calendar-commands.c:477
 msgid "%d %B %Y"
 msgstr "%d de %B de %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:442
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
-#: my-evolution/e-summary-calendar.c:240
+#: calendar/gui/calendar-commands.c:467
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1446
 msgid "%d %B"
 msgstr "%d de %b"
 
-#: calendar/gui/calendar-commands.c:604
+#: calendar/gui/calendar-commands.c:677
 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:355 calendar/gui/calendar-model.c:925
-#: calendar/gui/e-calendar-table.c:307
+#: calendar/gui/calendar-model.c:399 calendar/gui/calendar-model.c:994
+#: calendar/gui/e-calendar-table.c:364
 msgid "Private"
 msgstr "Privado"
 
-#: calendar/gui/calendar-model.c:358 calendar/gui/calendar-model.c:927
-#: calendar/gui/e-calendar-table.c:308
+#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:996
+#: calendar/gui/e-calendar-table.c:365
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/calendar-model.c:361 calendar/gui/e-calendar-table.c:306
+#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:363
 msgid "Public"
 msgstr "P�blico"
 
-#: calendar/gui/calendar-model.c:454
+#: calendar/gui/calendar-model.c:498
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:454
+#: calendar/gui/calendar-model.c:498
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:456
+#: calendar/gui/calendar-model.c:500
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:456
+#: calendar/gui/calendar-model.c:500
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:494 calendar/gui/calendar-model.c:1107
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:652
-msgid "High"
-msgstr "Alta"
-
-#: calendar/gui/calendar-model.c:496 calendar/gui/calendar-model.c:1109
-#: calendar/gui/calendar-model.c:1624
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:651
-msgid "Normal"
-msgstr "Normal"
-
-#: calendar/gui/calendar-model.c:498 calendar/gui/calendar-model.c:1111
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:650
-msgid "Low"
-msgstr "Baixa"
-
-#: calendar/gui/calendar-model.c:529 calendar/gui/calendar-model.c:1144
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/calendar-model.c:566 calendar/gui/calendar-model.c:1193
+#: calendar/gui/e-calendar-table.c:437
 msgid "Free"
 msgstr "Libre"
 
-#: calendar/gui/calendar-model.c:531 calendar/gui/e-calendar-table.c:381
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+#: calendar/gui/calendar-model.c:568 calendar/gui/e-calendar-table.c:438
+#: calendar/gui/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr "Ocupado"
 
-#: calendar/gui/calendar-model.c:680 calendar/gui/calendar-model.c:1192
+#: calendar/gui/calendar-model.c:717 calendar/gui/calendar-model.c:1241
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:401
+#: calendar/gui/e-calendar-table.c:458
 msgid "Not Started"
 msgstr "Non Iniciada"
 
-#: calendar/gui/calendar-model.c:683 calendar/gui/calendar-model.c:1194
+#: calendar/gui/calendar-model.c:720 calendar/gui/calendar-model.c:1243
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:402
+#: calendar/gui/e-calendar-table.c:459
 msgid "In Progress"
 msgstr "En Progreso"
 
-#: calendar/gui/calendar-model.c:686 calendar/gui/calendar-model.c:1196
-#: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/dialogs/meeting-page.c:696
+#: calendar/gui/calendar-model.c:723 calendar/gui/calendar-model.c:1245
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-calendar-table.c:460 calendar/gui/e-meeting-model.c:298
+#: calendar/gui/e-meeting-model.c:321
 msgid "Completed"
 msgstr "Completada"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:323
+#: calendar/gui/calendar-model.c:908 e-util/e-time-utils.c:163
+#: e-util/e-time-utils.c:354
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:842 e-util/e-time-utils.c:332
+#: calendar/gui/calendar-model.c:911 e-util/e-time-utils.c:158
+#: e-util/e-time-utils.c:363
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:847
+#: calendar/gui/calendar-model.c:916
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -3037,7 +3190,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:1011
+#: calendar/gui/calendar-model.c:1080
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3047,49 +3200,37 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1051
+#: calendar/gui/calendar-model.c:1120
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "A porcentaxe ten que ser un valor entre 0 e 100, inclusive"
 
-#: calendar/gui/calendar-model.c:1092
-msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
-msgstr "A prioridade ten que ser 'Alta', 'Normal', 'Baixa' ou 'Indefinida'."
-
-#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1105
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:331
-msgid "Undefined"
-msgstr "Indefinida"
-
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1190 calendar/gui/dialogs/meeting-page.c:368
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1430
-#: mail/mail-accounts.c:144 mail/mail-accounts.c:391
-#: mail/mail-config.glade.h:49
+#: calendar/gui/calendar-model.c:1239 calendar/gui/dialogs/meeting-page.c:332
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1446
+#: mail/mail-accounts.c:143 mail/mail-accounts.c:390
+#: mail/mail-config.glade.h:50
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:203
-#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
-#: widgets/misc/e-dateedit.c:1407 widgets/misc/e-dateedit.c:1522
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:453
+#: widgets/misc/e-dateedit.c:1453 widgets/misc/e-dateedit.c:1568
 msgid "None"
 msgstr "Nada"
 
-#: calendar/gui/calendar-model.c:1626
+#: calendar/gui/calendar-model.c:1675
 msgid "Recurring"
 msgstr "Recorrendo"
 
-#: calendar/gui/calendar-model.c:1628
+#: calendar/gui/calendar-model.c:1677
 msgid "Assigned"
 msgstr "Asignada"
 
-#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:645
-#: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/dialogs/meeting-page.c:1187
-#: calendar/gui/dialogs/meeting-page.c:1283
+#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:270
+#: calendar/gui/e-meeting-model.c:280 calendar/gui/e-meeting-model.c:506
+#: calendar/gui/e-meeting-model.c:702
 msgid "Yes"
 msgstr "Si"
 
-#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:657
-#: calendar/gui/dialogs/meeting-page.c:1284
+#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:282
+#: calendar/gui/e-meeting-model.c:703
 msgid "No"
 msgstr "Non"
 
@@ -3121,44 +3262,44 @@ msgstr "A descrici�n cont�n"
 msgid "Comment contains"
 msgstr "O comentario cont�n"
 
-#: calendar/gui/cal-search-bar.c:416
+#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1054
 msgid "Unmatched"
 msgstr "Non concorda"
 
-#: calendar/gui/component-factory.c:55 my-evolution/my-evolution.glade.h:6
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1055
+#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:6
+#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1056
 msgid "Calendar"
 msgstr "Axenda"
 
-#: calendar/gui/component-factory.c:55
+#: calendar/gui/component-factory.c:64
 msgid "Folder containing appointments and events"
 msgstr "Cartafol que cont�n citas e eventos"
 
-#: calendar/gui/component-factory.c:56 calendar/gui/print.c:1707
-#: my-evolution/e-summary-tasks.c:212 my-evolution/e-summary-tasks.c:228
-#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1058
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1723
+#: my-evolution/e-summary-tasks.c:237 my-evolution/e-summary-tasks.c:253
+#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1059
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Tarefas"
 
-#: calendar/gui/component-factory.c:56
+#: calendar/gui/component-factory.c:69
 msgid "Folder containing to-do items"
 msgstr "Cartafol que cont�n elementos para-facer"
 
-#: calendar/gui/component-factory.c:402 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:581 ui/evolution-calendar.xml.h:7
 msgid "Create a new appointment"
 msgstr "Crear unha nova cita"
 
-#: calendar/gui/component-factory.c:403 calendar/gui/e-day-view.c:3400
+#: calendar/gui/component-factory.c:582 calendar/gui/e-day-view.c:3422
 msgid "New _Appointment"
 msgstr "Nova C_ita"
 
-#: calendar/gui/component-factory.c:408 ui/evolution-calendar.xml.h:8
+#: calendar/gui/component-factory.c:587 ui/evolution-calendar.xml.h:8
 #: ui/evolution-tasks.xml.h:5
 msgid "Create a new task"
 msgstr "Crear unha nova tarefa"
 
-#: calendar/gui/component-factory.c:409
+#: calendar/gui/component-factory.c:588
 msgid "New _Task"
 msgstr "Nova T_arefa"
 
@@ -3166,23 +3307,23 @@ msgstr "Nova T_arefa"
 msgid "The URI that the calendar will display"
 msgstr "O URI que ha amosar a axenda"
 
-#: calendar/gui/dialogs/alarm-options.c:357
+#: calendar/gui/dialogs/alarm-options.c:359
 msgid "Audio Alarm Options"
 msgstr "Opci�ns das Alarmas Sonoras"
 
-#: calendar/gui/dialogs/alarm-options.c:366
+#: calendar/gui/dialogs/alarm-options.c:368
 msgid "Message Alarm Options"
 msgstr "Opci�ns das Alarmas de Mensaxes"
 
-#: calendar/gui/dialogs/alarm-options.c:375
+#: calendar/gui/dialogs/alarm-options.c:377
 msgid "Mail Alarm Options"
 msgstr "Opci�ns das Alarmas de Correo"
 
-#: calendar/gui/dialogs/alarm-options.c:384
+#: calendar/gui/dialogs/alarm-options.c:386
 msgid "Program Alarm Options"
 msgstr "Opci�ns de Alarma do Programa"
 
-#: calendar/gui/dialogs/alarm-options.c:393
+#: calendar/gui/dialogs/alarm-options.c:395
 msgid "Unknown Alarm Options"
 msgstr "Opci�ns de Alarma Desco�ecidas"
 
@@ -3191,25 +3332,27 @@ msgid "Alarm Repeat"
 msgstr "Repetici�n da Alarma"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid "FIXME: mail alarm options"
-msgstr "AM��AME: opci�ns de alarma de correo"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:3
 msgid "Message to Display"
 msgstr "Mensaxe a Amosar"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:4
+#: calendar/gui/dialogs/alarm-options.glade.h:3
 msgid "Play sound:"
 msgstr "Tocar un son:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:4
 msgid "Repeat the alarm"
 msgstr "Repetir a alarma"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:6
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Run program:"
 msgstr "Executar un programa:"
 
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+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 ""
+
 #: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "With these arguments:"
 msgstr "Con estes argumentos:"
@@ -3230,98 +3373,120 @@ msgstr "horas"
 msgid "minutes"
 msgstr "minutos"
 
-#: calendar/gui/dialogs/alarm-page.c:332
+#: calendar/gui/dialogs/alarm-page.c:307
 #, c-format
 msgid "%d days"
 msgstr "%d d�as"
 
-#: calendar/gui/dialogs/alarm-page.c:334
+#: calendar/gui/dialogs/alarm-page.c:310
 msgid "1 day"
 msgstr "1 d�a"
 
-#: calendar/gui/dialogs/alarm-page.c:337
+#: calendar/gui/dialogs/alarm-page.c:315
 #, c-format
 msgid "%d weeks"
 msgstr "%d semanas"
 
-#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.c:318
 msgid "1 week"
 msgstr "1 semana"
 
-#: calendar/gui/dialogs/alarm-page.c:342
+#: calendar/gui/dialogs/alarm-page.c:323
 #, c-format
 msgid "%d hours"
 msgstr "%d horas"
 
-#: calendar/gui/dialogs/alarm-page.c:344
+#: calendar/gui/dialogs/alarm-page.c:326
 msgid "1 hour"
 msgstr "1 hora"
 
-#: calendar/gui/dialogs/alarm-page.c:347
+#: calendar/gui/dialogs/alarm-page.c:331
 #, c-format
 msgid "%d minutes"
 msgstr "%d minutos"
 
-#: calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:334
 msgid "1 minute"
 msgstr "1 minuto"
 
-#: calendar/gui/dialogs/alarm-page.c:352
+#: calendar/gui/dialogs/alarm-page.c:339
 #, c-format
 msgid "%d seconds"
 msgstr "%d segundos"
 
-#: calendar/gui/dialogs/alarm-page.c:354
+#: calendar/gui/dialogs/alarm-page.c:342
 msgid "1 second"
 msgstr "1 segundo"
 
-#: calendar/gui/dialogs/alarm-page.c:379
+#: calendar/gui/dialogs/alarm-page.c:373
 #: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "Tocar un son"
 
-#: calendar/gui/dialogs/alarm-page.c:383
+#: calendar/gui/dialogs/alarm-page.c:377
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 msgid "Display a message"
 msgstr "Amosar unha mensaxe"
 
-#: calendar/gui/dialogs/alarm-page.c:387
-#: calendar/gui/dialogs/alarm-page.glade.h:7
+#: calendar/gui/dialogs/alarm-page.c:381
 msgid "Send an email"
 msgstr "Enviar unha mensaxe"
 
-#: calendar/gui/dialogs/alarm-page.c:391
+#: calendar/gui/dialogs/alarm-page.c:385
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "Executar un programa"
 
-#: calendar/gui/dialogs/alarm-page.c:397 calendar/gui/dialogs/alarm-page.c:433
-#: calendar/gui/dialogs/meeting-page.c:601
-#: calendar/gui/dialogs/meeting-page.c:636
-#: calendar/gui/dialogs/meeting-page.c:701
-#: calendar/gui/dialogs/meeting-page.c:1255
-#: calendar/gui/dialogs/meeting-page.c:1271
-#: camel/providers/smtp/camel-smtp-transport.c:224
-#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
-msgid "Unknown"
-msgstr "Desco�ecido"
+#: calendar/gui/dialogs/alarm-page.c:391
+#, fuzzy
+msgid "Unknown action to be performed"
+msgstr "Treboada desco�ecida"
 
-#: calendar/gui/dialogs/alarm-page.c:409
-msgid "before start of appointment"
+#: calendar/gui/dialogs/alarm-page.c:403
+#, fuzzy, c-format
+msgid "%s %s before the start of the appointment"
 msgstr "antes do comezo da cita"
 
-#: calendar/gui/dialogs/alarm-page.c:412
-msgid "after start of appointment"
-msgstr "despois do comezo da cita"
+#: calendar/gui/dialogs/alarm-page.c:406
+#, fuzzy, c-format
+msgid "%s %s after the start of the appointment"
+msgstr "antes do comezo da cita"
 
-#: calendar/gui/dialogs/alarm-page.c:422
-msgid "before end of appointment"
-msgstr "antes da fin da cita"
+#: calendar/gui/dialogs/alarm-page.c:411
+#, fuzzy, c-format
+msgid "%s at the start of the appointment"
+msgstr "antes do comezo da cita"
 
-#: calendar/gui/dialogs/alarm-page.c:425
-msgid "after end of appointment"
+#: calendar/gui/dialogs/alarm-page.c:420
+#, fuzzy, c-format
+msgid "%s %s before the end of the appointment"
+msgstr "antes do comezo da cita"
+
+#: calendar/gui/dialogs/alarm-page.c:423
+#, fuzzy, c-format
+msgid "%s %s after the end of the appointment"
 msgstr "despois da fin da cita"
 
+#: calendar/gui/dialogs/alarm-page.c:428
+#, fuzzy, c-format
+msgid "%s at the end of the appointment"
+msgstr "despois da fin da cita"
+
+#: calendar/gui/dialogs/alarm-page.c:439
+#, fuzzy, c-format
+msgid "%s at an unknown time"
+msgstr "un remitente desco�ecido"
+
+#: calendar/gui/dialogs/alarm-page.c:445
+#, fuzzy, c-format
+msgid "%s at %s"
+msgstr "Servidor %s %s"
+
+#: calendar/gui/dialogs/alarm-page.c:452
+#, c-format
+msgid "%s for an unknown trigger type"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3336,42 +3501,43 @@ msgstr "Data/Hora:"
 msgid "Reminders"
 msgstr "Recordatorios"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Resumo:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-page.glade.h:10
 msgid "_Options..."
 msgstr "_Opci�ns..."
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:34
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:11 filter/libfilter-i18n.h:2
 msgid "after"
 msgstr "despois"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:35
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:6
 msgid "before"
 msgstr "antes"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-page.glade.h:13
 #: calendar/gui/dialogs/recurrence-page.glade.h:14
 msgid "day(s)"
 msgstr "d�a(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-page.glade.h:14
 msgid "end of appointment"
 msgstr "fin da cita"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/alarm-page.glade.h:15
 msgid "hour(s)"
 msgstr "hora(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:116
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:116
 msgid "minute(s)"
 msgstr "minutos"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:18
+#: calendar/gui/dialogs/alarm-page.glade.h:17
 msgid "start of appointment"
 msgstr "comezo da cita"
 
@@ -3420,7 +3586,7 @@ msgid "First day of wee_k:"
 msgstr "_Primeiro d�a da semana:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:969
+#: calendar/gui/dialogs/recurrence-page.c:955
 msgid "Friday"
 msgstr "Venres"
 
@@ -3433,7 +3599,7 @@ msgid "Minutes"
 msgstr "Minutos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:965
+#: calendar/gui/dialogs/recurrence-page.c:951
 msgid "Monday"
 msgstr "Luns"
 
@@ -3442,7 +3608,7 @@ msgid "O_verdue tasks:"
 msgstr "Tarefas _retrasadas:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:970
+#: calendar/gui/dialogs/recurrence-page.c:956
 msgid "Saturday"
 msgstr "S�bado"
 
@@ -3463,7 +3629,7 @@ msgid "Su_n"
 msgstr "_Dom"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:971
+#: calendar/gui/dialogs/recurrence-page.c:957
 msgid "Sunday"
 msgstr "Domingo"
 
@@ -3480,7 +3646,7 @@ msgid "Tas_ks due today:"
 msgstr "Tarefas para _hoxe:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/recurrence-page.c:968
+#: calendar/gui/dialogs/recurrence-page.c:954
 msgid "Thursday"
 msgstr "Xoves"
 
@@ -3501,12 +3667,12 @@ msgid "Time format:"
 msgstr "Formato da hora:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:966
+#: calendar/gui/dialogs/recurrence-page.c:952
 msgid "Tuesday"
 msgstr "Martes"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:967
+#: calendar/gui/dialogs/recurrence-page.c:953
 msgid "Wednesday"
 msgstr "M�rcores"
 
@@ -3635,55 +3801,55 @@ msgstr "%s  Fixo cambios. �Quere esquecer estes cambios e actualizar o editor?"
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Non fixo cambios, �quere actualizar o editor?"
 
-#: calendar/gui/dialogs/comp-editor-util.c:159 calendar/gui/print.c:2116
+#: calendar/gui/dialogs/comp-editor-util.c:167 calendar/gui/print.c:2132
 msgid " to "
 msgstr " a "
 
-#: calendar/gui/dialogs/comp-editor-util.c:163 calendar/gui/print.c:2120
+#: calendar/gui/dialogs/comp-editor-util.c:171 calendar/gui/print.c:2136
 msgid " (Completed "
 msgstr " (Completada "
 
-#: calendar/gui/dialogs/comp-editor-util.c:165 calendar/gui/print.c:2122
+#: calendar/gui/dialogs/comp-editor-util.c:173 calendar/gui/print.c:2138
 msgid "Completed "
 msgstr "Completada "
 
-#: calendar/gui/dialogs/comp-editor-util.c:170 calendar/gui/print.c:2127
+#: calendar/gui/dialogs/comp-editor-util.c:178 calendar/gui/print.c:2143
 msgid " (Due "
 msgstr " (Pendente "
 
-#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2129
+#: calendar/gui/dialogs/comp-editor-util.c:180 calendar/gui/print.c:2145
 msgid "Due "
 msgstr "Pendente "
 
-#: calendar/gui/dialogs/comp-editor.c:462
+#: calendar/gui/dialogs/comp-editor.c:521
 msgid "Edit Appointment"
 msgstr "Editar Cita"
 
-#: calendar/gui/dialogs/comp-editor.c:467
+#: calendar/gui/dialogs/comp-editor.c:526
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:470
+#: calendar/gui/dialogs/comp-editor.c:529
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:473
+#: calendar/gui/dialogs/comp-editor.c:532
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada de diario - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:487
+#: calendar/gui/dialogs/comp-editor.c:546
 msgid "No summary"
 msgstr "Sen resumo"
 
-#: calendar/gui/dialogs/comp-editor.c:857 mail/mail-callbacks.c:1529
+#: calendar/gui/dialogs/comp-editor.c:952 mail/mail-callbacks.c:1671
 #: mail/mail-display.c:100
 msgid "Overwrite file?"
 msgstr "�Sobrescribir ficheiro?"
 
-#: calendar/gui/dialogs/comp-editor.c:861 mail/mail-callbacks.c:1535
+#: calendar/gui/dialogs/comp-editor.c:956 mail/mail-callbacks.c:1677
 #: mail/mail-display.c:104
 msgid ""
 "A file by that name already exists.\n"
@@ -3692,53 +3858,53 @@ msgstr ""
 "Xa existe un ficheiro con ese nome.\n"
 "�Sobrescribilo?"
 
-#: calendar/gui/dialogs/comp-editor.c:924 ui/evolution-comp-editor.xml.h:13
+#: calendar/gui/dialogs/comp-editor.c:1019 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "Gardar Como..."
 
-#: calendar/gui/dialogs/comp-editor.c:1077
+#: calendar/gui/dialogs/comp-editor.c:1172
 msgid "Unable to obtain current version!"
 msgstr "�Non foi posible obter a versi�n actual!"
 
-#: calendar/gui/dialogs/delete-comp.c:84
+#: calendar/gui/dialogs/delete-comp.c:91
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "�Est� seguro de que quere borrar a cita `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:87
+#: calendar/gui/dialogs/delete-comp.c:94
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "�Est� seguro de que quere borrar esta cita sen t�tulo?"
 
-#: calendar/gui/dialogs/delete-comp.c:93
+#: calendar/gui/dialogs/delete-comp.c:100
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "�Est� seguro de que quere borrar a tarefa `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/delete-comp.c:103
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "�Est� seguro de que quere borrar esta tarefa sen t�tulo?"
 
-#: calendar/gui/dialogs/delete-comp.c:102
+#: calendar/gui/dialogs/delete-comp.c:109
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "�Est� seguro de que quere borrar a entrada de diario `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:105
+#: calendar/gui/dialogs/delete-comp.c:112
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "�Est� seguro de que quere borrar esta entrada de diario sen t�tulo?"
 
-#: calendar/gui/dialogs/delete-comp.c:120
+#: calendar/gui/dialogs/delete-comp.c:127
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "�Est� seguro de que quere borrar %d citas?"
 
-#: calendar/gui/dialogs/delete-comp.c:125
+#: calendar/gui/dialogs/delete-comp.c:132
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "�Est� seguro de que quere borrar %d tarefas?"
 
-#: calendar/gui/dialogs/delete-comp.c:130
+#: calendar/gui/dialogs/delete-comp.c:137
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "�Est� seguro de que quere borrar %d entradas de diario?"
@@ -3755,20 +3921,26 @@ msgstr "Delegar En:"
 msgid "Enter Delegate"
 msgstr "Introducir Delegado"
 
-#: calendar/gui/dialogs/event-editor.c:156
+#: calendar/gui/dialogs/event-editor.c:181
 msgid "Appointment"
 msgstr "Cita"
 
-#: calendar/gui/dialogs/event-editor.c:161
+#: calendar/gui/dialogs/event-editor.c:186
 msgid "Reminder"
 msgstr "Recordatorio"
 
-#: calendar/gui/dialogs/event-editor.c:166
+#: calendar/gui/dialogs/event-editor.c:191
 msgid "Recurrence"
 msgstr "Recorrencia"
 
-#: calendar/gui/dialogs/event-editor.c:171
-#: calendar/gui/dialogs/event-editor.c:273
+#: calendar/gui/dialogs/event-editor.c:198
+#: calendar/gui/dialogs/event-editor.c:345
+#, fuzzy
+msgid "Scheduling"
+msgstr "_Programar Xuntanza"
+
+#: calendar/gui/dialogs/event-editor.c:203
+#: calendar/gui/dialogs/event-editor.c:348
 msgid "Meeting"
 msgstr "Xuntanza"
 
@@ -3827,170 +3999,94 @@ msgstr "Hora de _finalizaci�n:"
 msgid "_Start time:"
 msgstr "Hora de _comezo:"
 
-#: calendar/gui/dialogs/meeting-page.c:576
-#: calendar/gui/dialogs/meeting-page.c:593
-#: calendar/gui/dialogs/meeting-page.c:1183
-#: calendar/gui/dialogs/meeting-page.c:1251
-msgid "Individual"
-msgstr "Individual"
-
-#: calendar/gui/dialogs/meeting-page.c:578
-#: calendar/gui/dialogs/meeting-page.c:595
-#: calendar/gui/dialogs/meeting-page.c:1252
-msgid "Group"
-msgstr "Grupo"
-
-#: calendar/gui/dialogs/meeting-page.c:580
-#: calendar/gui/dialogs/meeting-page.c:597
-#: calendar/gui/dialogs/meeting-page.c:1253
-msgid "Resource"
-msgstr "Recurso"
-
-#: calendar/gui/dialogs/meeting-page.c:582
-#: calendar/gui/dialogs/meeting-page.c:599
-#: calendar/gui/dialogs/meeting-page.c:1254
-msgid "Room"
-msgstr "Cuarto"
-
-#: calendar/gui/dialogs/meeting-page.c:611
-#: calendar/gui/dialogs/meeting-page.c:628
-#: calendar/gui/dialogs/meeting-page.c:1267
-msgid "Chair"
-msgstr "Presidencia"
-
-#: calendar/gui/dialogs/meeting-page.c:613
-#: calendar/gui/dialogs/meeting-page.c:630
-#: calendar/gui/dialogs/meeting-page.c:1185
-#: calendar/gui/dialogs/meeting-page.c:1268
-msgid "Required Participant"
-msgstr "Participantes Requiridos"
-
-#: calendar/gui/dialogs/meeting-page.c:615
-#: calendar/gui/dialogs/meeting-page.c:632
-#: calendar/gui/dialogs/meeting-page.c:1269
-msgid "Optional Participant"
-msgstr "Participante Opcional"
-
-#: calendar/gui/dialogs/meeting-page.c:617
-#: calendar/gui/dialogs/meeting-page.c:634
-#: calendar/gui/dialogs/meeting-page.c:1270
-msgid "Non-Participant"
-msgstr "Non-Participante"
-
-#: calendar/gui/dialogs/meeting-page.c:663
-#: calendar/gui/dialogs/meeting-page.c:686
-#: calendar/gui/dialogs/meeting-page.c:1193
-#: calendar/gui/dialogs/meeting-page.c:1296
-msgid "Needs Action"
-msgstr "Precisa dunha Acci�n"
-
-#: calendar/gui/dialogs/meeting-page.c:665
-#: calendar/gui/dialogs/meeting-page.c:688
-#: calendar/gui/dialogs/meeting-page.c:1297
-msgid "Accepted"
-msgstr "Aceptado"
-
-#: calendar/gui/dialogs/meeting-page.c:667
-#: calendar/gui/dialogs/meeting-page.c:690
-#: calendar/gui/dialogs/meeting-page.c:1298
-msgid "Declined"
-msgstr "Rexeitado"
-
-#: calendar/gui/dialogs/meeting-page.c:669
-#: calendar/gui/dialogs/meeting-page.c:692
-#: calendar/gui/dialogs/meeting-page.c:1299
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
-msgid "Tentative"
-msgstr "Tentativa"
-
-#: calendar/gui/dialogs/meeting-page.c:671
-#: calendar/gui/dialogs/meeting-page.c:694
-#: calendar/gui/dialogs/meeting-page.c:1300
-msgid "Delegated"
-msgstr "Delegado"
-
-#: calendar/gui/dialogs/meeting-page.c:675
-#: calendar/gui/dialogs/meeting-page.c:698
-msgid "In Process"
-msgstr "En Progreso"
-
-#: calendar/gui/dialogs/meeting-page.c:737
+#: calendar/gui/dialogs/meeting-page.c:504
 msgid "That person is already attending the meeting!"
 msgstr "�Esa persoa xa asiste � xuntanza!"
 
-#: calendar/gui/dialogs/meeting-page.c:788
-#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:548
+#: calendar/gui/dialogs/meeting-page.c:583
 msgid "Chair Persons"
 msgstr "Presidentes"
 
-#: calendar/gui/dialogs/meeting-page.c:790
-#: calendar/gui/dialogs/meeting-page.c:842
-#: calendar/gui/dialogs/meeting-page.c:962
+#: calendar/gui/dialogs/meeting-page.c:550
+#: calendar/gui/dialogs/meeting-page.c:583
+#: calendar/gui/dialogs/meeting-page.c:703
 msgid "Required Participants"
 msgstr "Participantes Requiridos"
 
-#: calendar/gui/dialogs/meeting-page.c:792
-#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:552
+#: calendar/gui/dialogs/meeting-page.c:583
 msgid "Optional Participants"
 msgstr "Participantes Opcionais"
 
-#: calendar/gui/dialogs/meeting-page.c:794
-#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:554
+#: calendar/gui/dialogs/meeting-page.c:583
 msgid "Non-Participants"
 msgstr "Non-Participantes"
 
-#: calendar/gui/dialogs/meeting-page.c:920
+#: calendar/gui/dialogs/meeting-page.c:661
 msgid "Sent By:"
 msgstr "Enviada Por:"
 
-#: calendar/gui/dialogs/meeting-page.c:1471
+#: calendar/gui/dialogs/meeting-page.c:829
 msgid "_Delegate To..."
 msgstr "_Delegar En..."
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
+#: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Asistente"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
+#: calendar/gui/e-meeting-time-sel.etspec.h:2
 msgid "Click here to add an attendee"
 msgstr "Prema aqu� para engadir un asistente"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Common Name"
 msgstr "Nome Com�n"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
 msgid "Delegated From"
 msgstr "Delegada Por"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Delegated To"
 msgstr "Delegada En"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "Language"
 msgstr "Idioma"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "Member"
 msgstr "Membro"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Papel"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:15 filter/libfilter-i18n.h:31
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:49
 #: mail/message-list.etspec.h:8
 msgid "Status"
 msgstr "Estado"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:18 mail/mail-config.glade.h:85
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:86
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Tipo:"
@@ -4012,32 +4108,32 @@ msgstr "_Convidar a Outros"
 msgid "_Other Organizer"
 msgstr "_Outro Organizador"
 
-#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
-#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+#: calendar/gui/dialogs/recurrence-page.c:422 calendar/gui/print.c:1855
+#: calendar/gui/print.c:1857 calendar/gui/print.c:1858
 msgid "%a %b %d %Y"
 msgstr "%a, %d de %b de %Y"
 
-#: calendar/gui/dialogs/recurrence-page.c:584
+#: calendar/gui/dialogs/recurrence-page.c:570
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Esta cita cont�n recorrencias que Evolution non pode editar."
 
-#: calendar/gui/dialogs/recurrence-page.c:938
+#: calendar/gui/dialogs/recurrence-page.c:924
 msgid "on"
 msgstr "o"
 
-#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:950 filter/filter-datespec.c:83
 msgid "day"
 msgstr "d�a"
 
-#: calendar/gui/dialogs/recurrence-page.c:1094
+#: calendar/gui/dialogs/recurrence-page.c:1080
 msgid "on the"
 msgstr "no"
 
-#: calendar/gui/dialogs/recurrence-page.c:1102
+#: calendar/gui/dialogs/recurrence-page.c:1088
 msgid "th"
 msgstr " "
 
-#: calendar/gui/dialogs/recurrence-page.c:1275
+#: calendar/gui/dialogs/recurrence-page.c:1261
 msgid "occurrences"
 msgstr "ocorrencias"
 
@@ -4132,7 +4228,7 @@ msgid "Progress"
 msgstr "En Progreso"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:895
+#: my-evolution/e-summary-preferences.c:949
 msgid "URL:"
 msgstr "URL:"
 
@@ -4144,14 +4240,14 @@ msgstr "_Prioridade:"
 msgid "_Status:"
 msgstr "E_stado:"
 
-#: calendar/gui/dialogs/task-editor.c:161
-#: calendar/gui/dialogs/task-editor.c:239
+#: calendar/gui/dialogs/task-editor.c:184
+#: calendar/gui/dialogs/task-editor.c:285
 msgid "Assignment"
 msgstr "Asignaci�n"
 
 #: calendar/gui/dialogs/task-page.glade.h:4
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:28
 msgid "Description:"
 msgstr "Descrici�n:"
 
@@ -4167,105 +4263,105 @@ msgstr "_Confidencial"
 msgid "_Due Date:"
 msgstr "_Data L�mite"
 
-#: calendar/gui/e-calendar-table.c:350
+#: calendar/gui/e-calendar-table.c:407
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:351
+#: calendar/gui/e-calendar-table.c:408
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:409
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:410
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:411
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:412
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:356
+#: calendar/gui/e-calendar-table.c:413
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:357
+#: calendar/gui/e-calendar-table.c:414
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:358
+#: calendar/gui/e-calendar-table.c:415
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:359
+#: calendar/gui/e-calendar-table.c:416
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:360
+#: calendar/gui/e-calendar-table.c:417
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3421
-#: calendar/gui/e-week-view.c:3264 mail/folder-browser.c:1283
-#: shell/e-shortcuts-view.c:381
+#: calendar/gui/e-calendar-table.c:914 calendar/gui/e-day-view.c:3443
+#: calendar/gui/e-week-view.c:3296 mail/folder-browser.c:1371
+#: shell/e-shortcuts-view.c:385
 msgid "_Open"
 msgstr "_Abrir"
 
-#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3430
-#: calendar/gui/e-week-view.c:3273 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:918 calendar/gui/e-day-view.c:3452
+#: calendar/gui/e-week-view.c:3305 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:856 calendar/gui/e-day-view.c:3432
-#: calendar/gui/e-week-view.c:3275 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:920 calendar/gui/e-day-view.c:3454
+#: calendar/gui/e-week-view.c:3307 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:14
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3407
-#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3251
-#: calendar/gui/e-week-view.c:3277 ui/evolution-addressbook.xml.h:35
-#: ui/evolution-calendar.xml.h:39 ui/evolution-mail-list.xml.h:28
-#: ui/evolution-tasks.xml.h:16
+#: calendar/gui/e-calendar-table.c:922 calendar/gui/e-day-view.c:3429
+#: calendar/gui/e-day-view.c:3456 calendar/gui/e-week-view.c:3283
+#: calendar/gui/e-week-view.c:3309 ui/evolution-addressbook.xml.h:36
+#: ui/evolution-calendar.xml.h:40 ui/evolution-mail-list.xml.h:29
+#: ui/evolution-tasks.xml.h:17
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: calendar/gui/e-calendar-table.c:863
+#: calendar/gui/e-calendar-table.c:927
 msgid "_Mark as Complete"
 msgstr "_Marcar como Completa"
 
-#: calendar/gui/e-calendar-table.c:865
+#: calendar/gui/e-calendar-table.c:929
 msgid "_Delete this Task"
 msgstr "_Borrar esta Tarefa"
 
-#: calendar/gui/e-calendar-table.c:868
+#: calendar/gui/e-calendar-table.c:932
 msgid "_Mark Tasks as Complete"
 msgstr "_Marca-las Tarefas como Completas"
 
-#: calendar/gui/e-calendar-table.c:870
+#: calendar/gui/e-calendar-table.c:934
 msgid "_Delete Selected Tasks"
 msgstr "_Borra-las Tarefas Seleccionadas"
 
-#: calendar/gui/e-calendar-table.c:1130
+#: calendar/gui/e-calendar-table.c:1194
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Prema para engadir unha tarefa"
@@ -4274,12 +4370,8 @@ msgstr "Prema para engadir unha tarefa"
 msgid "Alarms"
 msgstr "Alarmas"
 
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Categor�as"
-
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:699
-#: camel/camel-filter-driver.c:815
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:718
+#: camel/camel-filter-driver.c:834
 msgid "Complete"
 msgstr "Completo"
 
@@ -4310,8 +4402,8 @@ 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:30 shell/e-shortcuts.c:1049
-#: shell/e-storage-set-view.c:1482 shell/e-summary-storage.c:80
+#: my-evolution/component-factory.c:45 shell/e-shortcuts.c:1050
+#: shell/e-storage-set-view.c:1420 shell/e-summary-storage.c:80
 msgid "Summary"
 msgstr "Resumo"
 
@@ -4330,61 +4422,78 @@ 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:285 calendar/gui/e-day-view.c:1354
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1374
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
 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:293 calendar/gui/e-day-view.c:1381
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1401
 #: calendar/gui/e-week-view-main-item.c:348
 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:588 calendar/gui/e-week-view.c:324
-#: calendar/gui/print.c:759
+#: calendar/gui/e-day-view.c:608 calendar/gui/e-week-view.c:345
+#: calendar/gui/print.c:769
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:591 calendar/gui/e-week-view.c:327
-#: calendar/gui/print.c:761
+#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:348
+#: calendar/gui/print.c:771
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3402 calendar/gui/e-week-view.c:3246
+#: calendar/gui/e-day-view.c:3424 calendar/gui/e-week-view.c:3278
 msgid "New All Day _Event"
 msgstr "Novo _Evento de D�a Completo"
 
-#: calendar/gui/e-day-view.c:3412 calendar/gui/e-week-view.c:3256
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3288
 #: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "Ir a _Hoxe"
 
-#: calendar/gui/e-day-view.c:3414 calendar/gui/e-week-view.c:3258
+#: calendar/gui/e-day-view.c:3436 calendar/gui/e-week-view.c:3290
 msgid "_Go to Date..."
 msgstr "_Ir � Data..."
 
-#: calendar/gui/e-day-view.c:3423 calendar/gui/e-week-view.c:3266
+#: calendar/gui/e-day-view.c:3445 calendar/gui/e-week-view.c:3298
 msgid "_Delete this Appointment"
 msgstr "_Borrar esta Cita"
 
-#: calendar/gui/e-day-view.c:3442 calendar/gui/e-week-view.c:3291
+#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3323
 msgid "Make this Occurrence _Movable"
 msgstr "Facer esta Ocorrencia _Movible"
 
-#: calendar/gui/e-day-view.c:3444 calendar/gui/e-week-view.c:3293
+#: calendar/gui/e-day-view.c:3466 calendar/gui/e-week-view.c:3325
 msgid "Delete this _Occurrence"
 msgstr "Borrar esta _Ocorrencia"
 
-#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3295
+#: calendar/gui/e-day-view.c:3468 calendar/gui/e-week-view.c:3327
 msgid "Delete _All Occurrences"
 msgstr "Borrar _T�dalas Ocorrencias"
 
+#: calendar/gui/e-itip-control.c:469
+msgid "Meeting begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:474
+msgid "Task begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:479
+#, fuzzy
+msgid "Free/Busy info begins: <b>"
+msgstr "Informaci�n de Libre/Ocupado"
+
+#: calendar/gui/e-itip-control.c:483
+msgid "Begins: <b>"
+msgstr ""
+
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:556
+#: calendar/gui/e-itip-control.c:677
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -4392,197 +4501,233 @@ msgstr ""
 "<br> Por favor, olle a seguinte informaci�n, e escolla unha acci�n do men� "
 "de embaixo."
 
-#: calendar/gui/e-itip-control.c:571
+#: calendar/gui/e-itip-control.c:692
 #, c-format
 msgid "<b>Summary:</b> %s<br><br>"
 msgstr "<b>Resumo:</b> %s<br><br>"
 
-#: calendar/gui/e-itip-control.c:571
+#: calendar/gui/e-itip-control.c:692
 msgid "<i>None</i>"
 msgstr "<i>Ningunha</i>"
 
-#: calendar/gui/e-itip-control.c:581
+#: calendar/gui/e-itip-control.c:702
 #, c-format
 msgid "<b>Description:</b> %s"
 msgstr "<b>Descrici�n:</b> %s"
 
-#: calendar/gui/e-itip-control.c:617
+#: calendar/gui/e-itip-control.c:737
 #, 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:618
+#: calendar/gui/e-itip-control.c:738
 msgid "Meeting Information"
 msgstr "Informaci�n da Xuntanza"
 
-#: calendar/gui/e-itip-control.c:622
+#: calendar/gui/e-itip-control.c:742
 #, 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:623
+#: calendar/gui/e-itip-control.c:743
 msgid "Meeting Proposal"
 msgstr "Proposta de Xuntanza"
 
-#: calendar/gui/e-itip-control.c:627
+#: calendar/gui/e-itip-control.c:747
 #, 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:628
+#: calendar/gui/e-itip-control.c:748
 msgid "Meeting Update"
 msgstr "Actualizaci�n da Xuntanza"
 
-#: calendar/gui/e-itip-control.c:632
+#: calendar/gui/e-itip-control.c:752
 #, 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:633
+#: calendar/gui/e-itip-control.c:753
 msgid "Meeting Update Request"
 msgstr "_Solicitude de Actualizaci�n de Xuntanza"
 
-#: calendar/gui/e-itip-control.c:637
+#: calendar/gui/e-itip-control.c:757
 #, 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:638
+#: calendar/gui/e-itip-control.c:758
 msgid "Meeting Reply"
 msgstr "Resposta de Xuntanza"
 
-#: calendar/gui/e-itip-control.c:642
+#: calendar/gui/e-itip-control.c:762
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> cancelou unha reuni�n."
 
-#: calendar/gui/e-itip-control.c:643
+#: calendar/gui/e-itip-control.c:763
 msgid "Meeting Cancellation"
 msgstr "Cancelaci�n da Xuntanza"
 
-#: calendar/gui/e-itip-control.c:647 calendar/gui/e-itip-control.c:695
-#: calendar/gui/e-itip-control.c:728
+#: calendar/gui/e-itip-control.c:767 calendar/gui/e-itip-control.c:815
+#: calendar/gui/e-itip-control.c:848
 #, 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:648
+#: calendar/gui/e-itip-control.c:768
 msgid "Bad Meeting Message"
 msgstr "Mensaxe Incorrecta sobre a Xuntanza"
 
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:785
 #, 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:666
+#: calendar/gui/e-itip-control.c:786
 msgid "Task Information"
 msgstr "Informaci�n da Tarefa"
 
-#: calendar/gui/e-itip-control.c:670
+#: calendar/gui/e-itip-control.c:790
 #, 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:671
+#: calendar/gui/e-itip-control.c:791
 msgid "Task Proposal"
 msgstr "Proposta de Tarefas"
 
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:795
 #, 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:676
+#: calendar/gui/e-itip-control.c:796
 msgid "Task Update"
 msgstr "Actualizaci�n de Tarefa"
 
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:800
 #, 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:681
+#: calendar/gui/e-itip-control.c:801
 msgid "Task Update Request"
 msgstr "Petici�n de Actualizaci�n de Tarefa"
 
-#: calendar/gui/e-itip-control.c:685
+#: calendar/gui/e-itip-control.c:805
 #, 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:686
+#: calendar/gui/e-itip-control.c:806
 msgid "Task Reply"
 msgstr "Resposta � Tarefa"
 
-#: calendar/gui/e-itip-control.c:690
+#: calendar/gui/e-itip-control.c:810
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> cancelou unha tarefa."
 
-#: calendar/gui/e-itip-control.c:691
+#: calendar/gui/e-itip-control.c:811
 msgid "Task Cancellation"
 msgstr "Cancelaci�n de Tarefa"
 
-#: calendar/gui/e-itip-control.c:696
+#: calendar/gui/e-itip-control.c:816
 msgid "Bad Task Message"
 msgstr "Mensaxe Incorrecta sobre a Tarefa"
 
-#: calendar/gui/e-itip-control.c:713
+#: calendar/gui/e-itip-control.c:833
 #, 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:714
+#: calendar/gui/e-itip-control.c:834
 msgid "Free/Busy Information"
 msgstr "Informaci�n de Libre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:718
+#: calendar/gui/e-itip-control.c:838
 #, 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:719
+#: calendar/gui/e-itip-control.c:839
 msgid "Free/Busy Request"
 msgstr "Petici�n de Libre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:843
 #, 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:724
+#: calendar/gui/e-itip-control.c:844
 msgid "Free/Busy Reply"
 msgstr "Resposta de Libre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:729
+#: calendar/gui/e-itip-control.c:849
 msgid "Bad Free/Busy Message"
 msgstr "Mensaxe de Libre/Ocupado Incorrecta"
 
-#: calendar/gui/e-itip-control.c:940
-msgid "I couldn't update your calendar file!\n"
-msgstr "�Non foi posible actualizar o ficheiro da axenda!\n"
+#: calendar/gui/e-itip-control.c:916
+#, 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:935
+#, fuzzy
+msgid "The message contains only unsupported requests."
+msgstr "Esta mensaxe s� cont�n destinatarios Bcc."
+
+#: calendar/gui/e-itip-control.c:963 calendar/gui/e-itip-control.c:969
+msgid "The attachment does not contain a valid calendar message"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:942
+#: calendar/gui/e-itip-control.c:1088
+#, fuzzy
+msgid "Calendar file could not be updated!\n"
+msgstr "�Non se puido envia-lo elemento!\n"
+
+#: calendar/gui/e-itip-control.c:1090
 msgid "Update complete\n"
 msgstr "Actualizaci�n completada\n"
 
-#: calendar/gui/e-itip-control.c:967
+#: calendar/gui/e-itip-control.c:1134
+msgid "Attendee status could not be updated because of an invalid status!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1142
+msgid "Attendee status ould not be updated!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1144
+#, fuzzy
+msgid "Attendee status updated\n"
+msgstr "Enderezo do asistente"
+
+#: calendar/gui/e-itip-control.c:1146
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1174
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "�Non se puido elimina-lo elemento do seu ficheiro de axenda!\n"
 
-#: calendar/gui/e-itip-control.c:969
+#: calendar/gui/e-itip-control.c:1176
 msgid "Removal Complete"
 msgstr "Eliminaci�n Completa"
 
-#: calendar/gui/e-itip-control.c:1001 calendar/gui/e-itip-control.c:1029
+#: calendar/gui/e-itip-control.c:1208 calendar/gui/e-itip-control.c:1242
 msgid "Item sent!\n"
 msgstr "�Elemento enviado!\n"
 
-#: calendar/gui/e-itip-control.c:1003 calendar/gui/e-itip-control.c:1031
+#: calendar/gui/e-itip-control.c:1210 calendar/gui/e-itip-control.c:1246
 msgid "The item could not be sent!\n"
 msgstr "�Non se puido envia-lo elemento!\n"
 
+#: calendar/gui/e-itip-control.c:1406
+msgid "Unable to find any of your identities in the attendees list!\n"
+msgstr ""
+
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
@@ -4620,6 +4765,169 @@ msgstr "data-finalizaci�n"
 msgid "date-start"
 msgstr "data-comezo"
 
+#: calendar/gui/e-meeting-model.c:201 calendar/gui/e-meeting-model.c:218
+#: calendar/gui/e-meeting-model.c:502 calendar/gui/e-meeting-model.c:670
+msgid "Individual"
+msgstr "Individual"
+
+#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
+#: calendar/gui/e-meeting-model.c:671
+msgid "Group"
+msgstr "Grupo"
+
+#: calendar/gui/e-meeting-model.c:205 calendar/gui/e-meeting-model.c:222
+#: calendar/gui/e-meeting-model.c:672
+msgid "Resource"
+msgstr "Recurso"
+
+#: calendar/gui/e-meeting-model.c:207 calendar/gui/e-meeting-model.c:224
+#: calendar/gui/e-meeting-model.c:673
+msgid "Room"
+msgstr "Cuarto"
+
+#: calendar/gui/e-meeting-model.c:226 calendar/gui/e-meeting-model.c:261
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:674
+#: calendar/gui/e-meeting-model.c:690
+#: camel/providers/smtp/camel-smtp-transport.c:224
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
+msgid "Unknown"
+msgstr "Desco�ecido"
+
+#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
+#: calendar/gui/e-meeting-model.c:686
+msgid "Chair"
+msgstr "Presidencia"
+
+#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
+#: calendar/gui/e-meeting-model.c:504 calendar/gui/e-meeting-model.c:687
+msgid "Required Participant"
+msgstr "Participantes Requiridos"
+
+#: calendar/gui/e-meeting-model.c:240 calendar/gui/e-meeting-model.c:257
+#: calendar/gui/e-meeting-model.c:688
+msgid "Optional Participant"
+msgstr "Participante Opcional"
+
+#: calendar/gui/e-meeting-model.c:242 calendar/gui/e-meeting-model.c:259
+#: calendar/gui/e-meeting-model.c:689
+msgid "Non-Participant"
+msgstr "Non-Participante"
+
+#: calendar/gui/e-meeting-model.c:288 calendar/gui/e-meeting-model.c:311
+#: calendar/gui/e-meeting-model.c:512 calendar/gui/e-meeting-model.c:715
+msgid "Needs Action"
+msgstr "Precisa dunha Acci�n"
+
+#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
+#: calendar/gui/e-meeting-model.c:716
+msgid "Accepted"
+msgstr "Aceptado"
+
+#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
+#: calendar/gui/e-meeting-model.c:717
+msgid "Declined"
+msgstr "Rexeitado"
+
+#: calendar/gui/e-meeting-model.c:294 calendar/gui/e-meeting-model.c:317
+#: calendar/gui/e-meeting-model.c:718 calendar/gui/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr "Tentativa"
+
+#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
+#: calendar/gui/e-meeting-model.c:719
+msgid "Delegated"
+msgstr "Delegado"
+
+#: calendar/gui/e-meeting-model.c:300 calendar/gui/e-meeting-model.c:323
+msgid "In Process"
+msgstr "En Progreso"
+
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:472
+#: calendar/gui/e-meeting-time-sel.c:1937
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d de %B de %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:476
+#: calendar/gui/e-meeting-time-sel.c:1965 e-util/e-time-utils.c:186
+#: e-util/e-time-utils.c:345
+msgid "%a %m/%d/%Y"
+msgstr "%a %d/%m/%Y"
+
+#. This is a strftime() format string %m = month number,
+#. %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:480 e-util/e-time-utils.c:221
+#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1577
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
+
+#: calendar/gui/e-meeting-time-sel.c:394
+msgid "Out of Office"
+msgstr "F�ra da Oficina"
+
+#: calendar/gui/e-meeting-time-sel.c:395
+msgid "No Information"
+msgstr "Sen Informaci�n"
+
+#: calendar/gui/e-meeting-time-sel.c:411
+msgid "_Invite Others..."
+msgstr "_Convidar Outros..."
+
+#: calendar/gui/e-meeting-time-sel.c:431
+msgid "_Options"
+msgstr "_Opci�ns"
+
+#: calendar/gui/e-meeting-time-sel.c:448
+msgid "Show _Only Working Hours"
+msgstr "Amosar _S� as Horas de Traballo"
+
+#: calendar/gui/e-meeting-time-sel.c:461
+msgid "Show _Zoomed Out"
+msgstr "Amozar sen _Zoom"
+
+#: calendar/gui/e-meeting-time-sel.c:479
+msgid "_Update Free/Busy"
+msgstr "_Actualizar Libres/Ocupadas"
+
+#: calendar/gui/e-meeting-time-sel.c:497
+msgid "_<<"
+msgstr "_<<"
+
+#: calendar/gui/e-meeting-time-sel.c:514
+msgid "_Autopick"
+msgstr "_Autoescoller"
+
+#: calendar/gui/e-meeting-time-sel.c:528
+msgid ">_>"
+msgstr ">_>"
+
+#: calendar/gui/e-meeting-time-sel.c:545
+msgid "_All People and Resources"
+msgstr "_T�dalas Persoas e Recursos"
+
+#: calendar/gui/e-meeting-time-sel.c:558
+msgid "All _People and One Resource"
+msgstr "T�dalas _Persoas e Un Recurso"
+
+#: calendar/gui/e-meeting-time-sel.c:571
+msgid "_Required People"
+msgstr "Persoas _Requiridas"
+
+#: calendar/gui/e-meeting-time-sel.c:584
+msgid "Required People and _One Resource"
+msgstr "Persoas Requiridas e _Un Recurso"
+
+#: calendar/gui/e-meeting-time-sel.c:607
+msgid "Meeting _start time:"
+msgstr "Hora do _inicio da reuni�n:"
+
+#: calendar/gui/e-meeting-time-sel.c:626
+msgid "Meeting _end time:"
+msgstr "Hora do _final da reuni�n:"
+
 #: calendar/gui/e-tasks.c:349
 #, c-format
 msgid "Could not load the tasks in `%s'"
@@ -4630,16 +4938,16 @@ msgstr "Non foi posible cargar as tarefas en `%s'"
 msgid "The method required to load `%s' is not supported"
 msgstr "O m�todo requirido para cargar `%s' non est� soportado"
 
-#: calendar/gui/e-week-view.c:3244 calendar/gui/e-week-view.c:3282
+#: calendar/gui/e-week-view.c:3276 calendar/gui/e-week-view.c:3314
 msgid "New _Appointment..."
 msgstr "Nova _Cita..."
 
-#: calendar/gui/gnome-cal.c:1260
+#: calendar/gui/gnome-cal.c:1319
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Non foi posible abrir o cartafol en `%s'"
 
-#: calendar/gui/gnome-cal.c:1271
+#: calendar/gui/gnome-cal.c:1330
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "O m�todo requirido para cargar `%s' non est� soportado"
@@ -4700,209 +5008,210 @@ msgstr "outubro"
 msgid "September"
 msgstr "setembro"
 
-#: calendar/gui/itip-utils.c:254
+#: calendar/gui/itip-utils.c:274
 msgid "An organizer must be set."
 msgstr "Debe estabrecerse un organizador."
 
-#: calendar/gui/itip-utils.c:300
-msgid "Calendar attachment"
-msgstr "Calendario anexo"
+#: calendar/gui/main.c:92
+#, fuzzy
+msgid "Could not create the component editor factory"
+msgstr "Non foi posible crear a f�brica do servicio de notificaci�ns de alarma"
 
-#: calendar/gui/print.c:422
+#: calendar/gui/print.c:426
 msgid "1st"
 msgstr "1"
 
-#: calendar/gui/print.c:422
+#: calendar/gui/print.c:426
 msgid "2nd"
 msgstr "2"
 
-#: calendar/gui/print.c:422
+#: calendar/gui/print.c:426
 msgid "3rd"
 msgstr "3"
 
-#: calendar/gui/print.c:422
+#: calendar/gui/print.c:426
 msgid "4th"
 msgstr "4"
 
-#: calendar/gui/print.c:422
+#: calendar/gui/print.c:426
 msgid "5th"
 msgstr "5"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:427
 msgid "6th"
 msgstr "6"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:427
 msgid "7th"
 msgstr "7"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:427
 msgid "8th"
 msgstr "8"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:427
 msgid "9th"
 msgstr "9"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:427
 msgid "10th"
 msgstr "10"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:428
 msgid "11th"
 msgstr "11"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:428
 msgid "12th"
 msgstr "12"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:428
 msgid "13th"
 msgstr "13"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:428
 msgid "14th"
 msgstr "14"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:428
 msgid "15th"
 msgstr "15"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:429
 msgid "16th"
 msgstr "16"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:429
 msgid "17th"
 msgstr "17"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:429
 msgid "18th"
 msgstr "18"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:429
 msgid "19th"
 msgstr "19"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:429
 msgid "20th"
 msgstr "20"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:430
 msgid "21st"
 msgstr "21"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:430
 msgid "22nd"
 msgstr "22"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:430
 msgid "23rd"
 msgstr "23"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:430
 msgid "24th"
 msgstr "24"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:430
 msgid "25th"
 msgstr "25"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:431
 msgid "26th"
 msgstr "26"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:431
 msgid "27th"
 msgstr "27"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:431
 msgid "28th"
 msgstr "28"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:431
 msgid "29th"
 msgstr "29"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:431
 msgid "30th"
 msgstr "30"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:432
 msgid "31st"
 msgstr "31"
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:499
 msgid "Su"
 msgstr "Do"
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:499
 msgid "Mo"
 msgstr "Lu"
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:499
 msgid "Tu"
 msgstr "Ma"
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:499
 msgid "We"
 msgstr "Me"
 
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:500
 msgid "Th"
 msgstr "Xo"
 
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:500
 msgid "Fr"
 msgstr "Ve"
 
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:500
 msgid "Sa"
 msgstr "S�"
 
 #. Day
-#: calendar/gui/print.c:1815
+#: calendar/gui/print.c:1831
 msgid "Selected day (%a %b %d %Y)"
 msgstr "D�a seleccionado (%a, %d de %b de %Y)"
 
-#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
+#: calendar/gui/print.c:1850 calendar/gui/print.c:1854
 msgid "%a %b %d"
 msgstr "%a, %d de %b"
 
-#: calendar/gui/print.c:1835
+#: calendar/gui/print.c:1851
 msgid "%a %d %Y"
 msgstr "%a %d de %Y"
 
-#: calendar/gui/print.c:1846
+#: calendar/gui/print.c:1862
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Semana seleccionada (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1854
+#: calendar/gui/print.c:1870
 msgid "Selected month (%b %Y)"
 msgstr "Mes seleccionado (%b de %Y)"
 
 #. Year
-#: calendar/gui/print.c:1861
+#: calendar/gui/print.c:1877
 msgid "Selected year (%Y)"
 msgstr "Ano seleccionado (%Y)"
 
-#: calendar/gui/print.c:2200
+#: calendar/gui/print.c:2221
 msgid "Print Calendar"
 msgstr "Imprimir Axenda"
 
-#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
-#: mail/mail-callbacks.c:1938 my-evolution/e-summary.c:511
+#: calendar/gui/print.c:2312 calendar/gui/print.c:2404
+#: mail/mail-callbacks.c:2080 my-evolution/e-summary.c:607
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
 msgstr "Previsualizaci�n da Impresi�n"
 
-#: calendar/gui/print.c:2317
+#: calendar/gui/print.c:2341
 msgid "Print Item"
 msgstr "Imprimir Elemento"
 
-#: calendar/gui/print.c:2398
+#: calendar/gui/print.c:2422
 msgid "Print Setup"
 msgstr "Configuraci�n da Impresi�n"
 
@@ -5048,7 +5357,17 @@ msgstr ""
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? espera 0 argumentos"
 
-#: calendar/pcs/query.c:1085
+#: calendar/pcs/query.c:862
+#, fuzzy
+msgid "completed-before? expects 1 argument"
+msgstr "is-completed? espera 0 argumentos"
+
+#: calendar/pcs/query.c:867
+#, 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:1155
 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"
 
@@ -5098,66 +5417,83 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr "Volvendo a sincronizar co servidor"
 
-#: camel/camel-disco-store.c:305
+#: camel/camel-disco-store.c:336
 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:533 camel/camel-filter-driver.c:542
+#: camel/camel-filter-driver.c:549 camel/camel-filter-driver.c:558
 msgid "Syncing folders"
 msgstr "Sincronizando cartafoles"
 
-#: camel/camel-filter-driver.c:644
+#: camel/camel-filter-driver.c:659
 msgid "Unable to open spool folder"
 msgstr "Incapaz de abrir o cartafol spool"
 
-#: camel/camel-filter-driver.c:653
+#: camel/camel-filter-driver.c:668
 msgid "Unable to process spool folder"
 msgstr "Incapaz de procesar o cartafol spool"
 
-#: camel/camel-filter-driver.c:667
+#: camel/camel-filter-driver.c:683
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Recibindo a mensaxe %d (%d%%)"
 
-#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
+#: camel/camel-filter-driver.c:687 camel/camel-filter-driver.c:700
 #, c-format
 msgid "Failed on message %d"
 msgstr "Fallo na mensaxe %d"
 
-#: camel/camel-filter-driver.c:672
+#: camel/camel-filter-driver.c:688
 msgid "Cannot open message"
 msgstr "Non se pode abrir a mensaxe"
 
-#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
+#: camel/camel-filter-driver.c:714 camel/camel-filter-driver.c:829
 msgid "Syncing folder"
 msgstr "Sincronizando cartafol"
 
-#: camel/camel-filter-driver.c:766
+#: camel/camel-filter-driver.c:786
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Recibindo a mensaxe %d de %d"
 
-#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
+#: camel/camel-filter-driver.c:791 camel/camel-filter-driver.c:809
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Fallou na mensaxe %d de %d"
 
-#: camel/camel-filter-driver.c:892
+#: camel/camel-filter-driver.c:918
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Erro ao analizar o filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:898
+#: camel/camel-filter-driver.c:924
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Erro ao executar o filtro: %s: %s"
 
-#: camel/camel-filter-search.c:468 camel/camel-filter-search.c:475
+#: camel/camel-filter-search.c:494 camel/camel-filter-search.c:501
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Erro ao executar a busca por filtro: %s: %s"
 
-#: camel/camel-folder-search.c:328
+#: camel/camel-folder.c:472
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1039
+#, fuzzy, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr ""
+"Erro ao executar a expresi�n de busca: %s:\n"
+"%s"
+
+#: camel/camel-folder.c:1219
+#, fuzzy
+msgid "Moving messages"
+msgstr "Copiando as mensaxes"
+
+#: camel/camel-folder-search.c:333
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -5166,7 +5502,7 @@ msgstr ""
 "Non se pode analizar a expresi�n de busca: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:338
+#: camel/camel-folder-search.c:343
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -5175,16 +5511,16 @@ msgstr ""
 "Erro ao executar a expresi�n de busca: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:485 camel/camel-folder-search.c:513
+#: camel/camel-folder-search.c:560 camel/camel-folder-search.c:588
 msgid "(match-all) requires a single bool result"
 msgstr "(coinciden-todas) require un �nico resultado booleano"
 
-#: camel/camel-folder-search.c:563
+#: camel/camel-folder-search.c:638
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Efectuando petici�n sobre a cabeceira desco�ecida: %s"
 
-#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:716
+#: camel/camel-folder-search.c:748 camel/camel-folder-search.c:792
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Tipo inv�lido no contido do corpo, esper�base unha cadea"
 
@@ -5221,12 +5557,12 @@ msgstr ""
 "A operaci�n expirou tentando obter o ficheiro de bloqueo sobre %s. T�nteo de "
 "novo m�is tarde."
 
-#: camel/camel-lock.c:201
+#: camel/camel-lock.c:205
 #, 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:255
+#: camel/camel-lock.c:267
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Non se puido obter un bloqueo usando flock(2): %s"
@@ -5285,56 +5621,84 @@ 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-pgp-context.c:193
+#: camel/camel-pgp-context.c:191
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Introduza o seu contrasinal %s para %s"
 
-#: camel/camel-pgp-context.c:196
+#: camel/camel-pgp-context.c:194
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "Introduza o seu contrasinal %s"
 
-#: camel/camel-pgp-context.c:518
-msgid "No plaintext to sign."
-msgstr "Non hai texto plano para asinar."
+#: camel/camel-pgp-context.c:525
+#, fuzzy
+msgid "Cannot sign this message: no plaintext to sign"
+msgstr "Non se pode enviar a mensaxe: non se definiron destinatarios."
 
-#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
-#: camel/camel-pgp-context.c:1079 camel/camel-pgp-context.c:1266
-msgid "No password provided."
-msgstr "Non se indicou un contrasinal."
+#: camel/camel-pgp-context.c:532 camel/camel-pgp-context.c:706
+#, fuzzy
+msgid "Cannot sign this message: no password provided"
+msgstr "Non se pode enviar a mensaxe: enderezo do autor non v�lido"
 
-#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
-#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1086
-#: camel/camel-pgp-context.c:1273
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
+#: camel/camel-pgp-context.c:538 camel/camel-pgp-context.c:712
+#, fuzzy, c-format
+msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "Non foi posible crear unha canalizaci�n co GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:693
-msgid "No plaintext to clearsign."
-msgstr "Non hai texto plano para asinar en claro."
+#: camel/camel-pgp-context.c:699
+#, fuzzy
+msgid "Cannot sign this message: no plaintext to clearsign"
+msgstr "Non se pode enviar a mensaxe: non se definiron destinatarios."
 
-#: camel/camel-pgp-context.c:886
-msgid "No plaintext to verify."
-msgstr "Non hai texto plano para verificar."
+#: camel/camel-pgp-context.c:891
+#, fuzzy
+msgid "Cannot verify this message: no plaintext to verify"
+msgstr "Non se pode enviar a mensaxe: non se definiron destinatarios."
 
-#: camel/camel-pgp-context.c:903
-#, c-format
-msgid "Couldn't create temp file: %s"
+#: camel/camel-pgp-context.c:897
+#, fuzzy, c-format
+msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
+msgstr "Non foi posible crear unha canalizaci�n co GPG/PGP: %s"
+
+#: camel/camel-pgp-context.c:908
+#, fuzzy, c-format
+msgid "Cannot verify this message: couldn't create temp file: %s"
 msgstr "Non foi posible crear o ficheiro temporal: %s"
 
-#: camel/camel-pgp-context.c:1069
-msgid "No plaintext to encrypt."
-msgstr "Non hai texto plano para cifrar."
+#: camel/camel-pgp-context.c:1076
+#, fuzzy
+msgid "Cannot encrypt this message: no plaintext to encrypt"
+msgstr "Non se pode enviar a mensaxe: non se definiron destinatarios."
+
+#: camel/camel-pgp-context.c:1086
+#, fuzzy
+msgid "Cannot encrypt this message: no password provided"
+msgstr "Non se pode enviar a mensaxe: enderezo do autor non v�lido"
+
+#: camel/camel-pgp-context.c:1093
+#, fuzzy, c-format
+msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
+msgstr "Non foi posible crear unha canalizaci�n co GPG/PGP: %s"
+
+#: camel/camel-pgp-context.c:1102
+#, fuzzy
+msgid "Cannot encrypt this message: no recipients specified"
+msgstr "Non se pode enviar a mensaxe: non se definiron destinatarios."
+
+#: camel/camel-pgp-context.c:1264
+#, fuzzy
+msgid "Cannot decrypt this message: no ciphertext to decrypt"
+msgstr "Non se pode enviar a mensaxe: non se definiron destinatarios."
 
-#: camel/camel-pgp-context.c:1095
-msgid "No recipients specified"
-msgstr "Non se especificaron destinatarios."
+#: camel/camel-pgp-context.c:1272
+msgid "Cannot decrypt this message: no password provided"
+msgstr ""
 
-#: camel/camel-pgp-context.c:1258
-msgid "No ciphertext to decrypt."
-msgstr "Non hai texto cifrado para descifrar."
+#: camel/camel-pgp-context.c:1279
+#, fuzzy, c-format
+msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
+msgstr "Non foi posible crear unha canalizaci�n co GPG/PGP: %s"
 
 #: camel/camel-provider.c:131
 #, c-format
@@ -5352,38 +5716,39 @@ msgstr "Non foi posible cargar %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Non foi posible cargar %s: Non hai c�digo de inicializaci�n no m�dulo."
 
-#: camel/camel-remote-store.c:191
+#: camel/camel-remote-store.c:203
 #, c-format
 msgid "%s server %s"
 msgstr "Servidor %s %s"
 
-#: camel/camel-remote-store.c:195
+#: camel/camel-remote-store.c:207
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "Servicio %s para %s en %s"
 
-#: camel/camel-remote-store.c:252
+#: camel/camel-remote-store.c:264
 msgid "Connection cancelled"
 msgstr "Conexi�n cancelada"
 
-#: camel/camel-remote-store.c:255
+#: camel/camel-remote-store.c:267
 #: camel/providers/smtp/camel-smtp-transport.c:272
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Non foi posible conectarse a %s (porto %d): %s"
 
-#: camel/camel-remote-store.c:256
+#: camel/camel-remote-store.c:268
 msgid "(unknown host)"
 msgstr "(m�quina desco�ecida)"
 
-#: camel/camel-remote-store.c:353 camel/camel-remote-store.c:415
-#: camel/camel-remote-store.c:486
+#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
+#: camel/camel-remote-store.c:483
 #: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "Operaci�n cancelada"
 
-#: camel/camel-remote-store.c:491
-msgid "Server unexpectedly disconnected"
+#: camel/camel-remote-store.c:486
+#, fuzzy, c-format
+msgid "Server unexpectedly disconnected: %s"
 msgstr "O servidor desconectou inesperadamente"
 
 #: camel/camel-sasl-anonymous.c:33
@@ -5493,7 +5858,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:440
+#: camel/providers/imap/camel-imap-store.c:494
 msgid "Bad authentication response from server."
 msgstr "Mala resposta de autenticaci�n do servidor."
 
@@ -5511,7 +5876,7 @@ msgstr "Estado de autenticaci�n desco�ecido."
 
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:302
-#: camel/providers/pop3/camel-pop3-provider.c:66 mail/mail-config.glade.h:54
+#: camel/providers/pop3/camel-pop3-provider.c:68 mail/mail-config.glade.h:55
 msgid "Password"
 msgstr "Contrasinal"
 
@@ -5540,55 +5905,55 @@ msgstr "Autorizaci�n POP antes de SMTP usando unha fonte non-pop"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Fallo na compilaci�n da expresi�n regular: %s: %s"
 
-#: camel/camel-service.c:155
+#: camel/camel-service.c:157
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "O URL '%s' necesita unha parte co nome do usuario"
 
-#: camel/camel-service.c:163
+#: camel/camel-service.c:165
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "O URL '%s' necesita unha parte co nome de m�quina"
 
-#: camel/camel-service.c:171
+#: camel/camel-service.c:173
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "O URL '%s' necesita unha parte coa ruta"
 
-#: camel/camel-service.c:549
+#: camel/camel-service.c:602
 #, c-format
 msgid "Resolving: %s"
 msgstr "Resolvendo: %s"
 
-#: camel/camel-service.c:576
+#: camel/camel-service.c:629
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Fallo na b�squeda do nome: %s"
 
-#: camel/camel-service.c:601
+#: camel/camel-service.c:654
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Fallo na busca do servidor: %s: servidor non atopado"
 
-#: camel/camel-service.c:603
+#: camel/camel-service.c:656
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Fallo na busca do servidor: %s: motivo desco�ecido"
 
-#: camel/camel-session.c:68
+#: camel/camel-session.c:76
 msgid "Virtual folder email provider"
 msgstr "Fornecedor de correo do cartafol virtual"
 
-#: camel/camel-session.c:70
+#: camel/camel-session.c:78
 msgid "For reading mail as a query of another set of folders"
 msgstr "Para ler correo coma unha petici�n de outro conxunto de cartafoles"
 
-#: camel/camel-session.c:297 camel/camel-session.c:366
+#: camel/camel-session.c:324 camel/camel-session.c:393
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Non hai ning�n fornecedor dispo�ible para o protocolo `%s'"
 
-#: camel/camel-session.c:483
+#: camel/camel-session.c:510
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -5634,7 +5999,12 @@ msgstr "Non se puido descodifica-la mensaxe."
 msgid "Failed to verify certificates."
 msgstr "Non se puido verifica-los certificados."
 
-#: camel/camel-tcp-stream-openssl.c:463
+#: camel/camel-store.c:273
+#, fuzzy
+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:491
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -5644,7 +6014,7 @@ msgstr ""
 "Asunto: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:369
+#: camel/camel-tcp-stream-openssl.c:496 camel/camel-tcp-stream-ssl.c:369
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -5683,16 +6053,40 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Non foi posible analizar o URL `%s'"
 
-#: camel/camel-vee-folder.c:452
+#: camel/camel-vee-folder.c:554
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Non existe a mensaxe %s en %s"
 
-#: camel/camel-vee-folder.c:547
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message: %s"
 msgstr "Non existe a mensaxe: %s"
 
+#: camel/camel-vee-store.c:250
+#, fuzzy, c-format
+msgid "Cannot delete folder: %s: Invalid operation"
+msgstr ""
+"Non foi posible borrar o cartafol:\n"
+"%s"
+
+#: camel/camel-vee-store.c:286
+#, 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:298
+#, fuzzy, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "Non foi posible renomear o cartafol: %s"
+
+#: camel/camel-vee-store.c:326
+#, fuzzy, c-format
+msgid "Cannot rename folder: %s: No such folder"
+msgstr "Non foi posible renomear o cartafol %s a %s: %s"
+
 #: camel/camel-vtrash-folder.c:109
 msgid "You cannot copy messages from this trash folder."
 msgstr "Non pode copiar mensaxes deste cartafol de lixo."
@@ -5721,40 +6115,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:190
+#: camel/providers/imap/camel-imap-folder.c:189
 #, 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:209
+#: camel/providers/imap/camel-imap-folder.c:208
 #, 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:273
+#: camel/providers/imap/camel-imap-folder.c:272
 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:435
+#: camel/providers/imap/camel-imap-folder.c:434
 msgid "Scanning for changed messages"
 msgstr "Buscando mensaxes cambiadas"
 
 #: camel/providers/imap/camel-imap-folder.c:1491
-#: camel/providers/imap/camel-imap-folder.c:1915
+#: camel/providers/imap/camel-imap-folder.c:1899
 msgid "This message is not currently available"
 msgstr "Esta mensaxe non est� dispo�ible actualmente."
 
-#: camel/providers/imap/camel-imap-folder.c:1634
-#: camel/providers/imap/camel-imap-folder.c:1715
+#: camel/providers/imap/camel-imap-folder.c:1633
+#: camel/providers/imap/camel-imap-folder.c:1714
 msgid "Fetching summary information for new messages"
 msgstr "Recollendo informaci�n de resumo para as mensaxes novas"
 
-#: camel/providers/imap/camel-imap-folder.c:1640
+#: camel/providers/imap/camel-imap-folder.c:1639
 msgid "Scanning for new messages"
 msgstr "Buscando mensaxes novas"
 
-#: camel/providers/imap/camel-imap-folder.c:1948
+#: camel/providers/imap/camel-imap-folder.c:1936
 msgid "Could not find message body in FETCH response."
 msgstr "Non foi posible atopar o corpo da mensaxe na resposta FETCH."
 
@@ -5763,7 +6157,15 @@ 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-provider.c:43 mail/mail-config.glade.h:14
+#: camel/providers/imap/camel-imap-message-cache.c:243
+#: camel/providers/imap/camel-imap-message-cache.c:299
+#: camel/providers/imap/camel-imap-message-cache.c:330
+#: camel/providers/imap/camel-imap-message-cache.c:362
+#, fuzzy, c-format
+msgid "Failed to cache message %s: %s"
+msgstr "Non se puido descodifica-la mensaxe."
+
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:15
 msgid "Checking for new mail"
 msgstr "Comprobando o novo correo"
 
@@ -5771,7 +6173,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:750
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:767
 msgid "Folders"
 msgstr "Cartafoles"
 
@@ -5804,28 +6206,28 @@ 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:463
+#: camel/providers/imap/camel-imap-store.c:517
 #, 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:473
+#: camel/providers/imap/camel-imap-store.c:527
 #: camel/providers/smtp/camel-smtp-transport.c:388
 #, 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:497
+#: camel/providers/imap/camel-imap-store.c:551
 #, 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:512
+#: camel/providers/imap/camel-imap-store.c:566
 #: camel/providers/smtp/camel-smtp-transport.c:432
 msgid "You didn't enter a password."
 msgstr "Non introduciu un contrasinal."
 
-#: camel/providers/imap/camel-imap-store.c:538
+#: camel/providers/imap/camel-imap-store.c:592
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -5836,12 +6238,12 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:837
+#: camel/providers/imap/camel-imap-store.c:891
 #, c-format
 msgid "No such folder %s"
 msgstr "Non existe o cartafol %s"
 
-#: camel/providers/imap/camel-imap-store.c:1038
+#: camel/providers/imap/camel-imap-store.c:1131
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Non se lle permite ao cartafol pai conter subcartafoles"
 
@@ -5862,81 +6264,86 @@ msgid "For retrieving local mail from standard mbox formated spools."
 msgstr "Para recibir correo local dende spools est�ndar con formato mbox."
 
 #: camel/providers/local/camel-local-provider.c:60
+#, fuzzy
+msgid "Apply filters to new messages in INBOX"
+msgstr "Aplicar filtros �s mensaxes novas de INBOX neste servidor"
+
+#: camel/providers/local/camel-local-provider.c:66
 msgid "Qmail maildir-format mail files"
 msgstr "Ficheiros de correo con formato maildir de Qmail"
 
-#: camel/providers/local/camel-local-provider.c:61
+#: camel/providers/local/camel-local-provider.c:67
 msgid "For storing local mail in qmail maildir directories."
 msgstr "Para armacenar correo local en directorios maildir de qmail"
 
-#: camel/providers/local/camel-local-provider.c:70
+#: camel/providers/local/camel-local-provider.c:78
 msgid "Standard Unix mbox spools"
 msgstr "Spools mbox est�ndar de Unix"
 
-#: camel/providers/local/camel-local-provider.c:71
+#: camel/providers/local/camel-local-provider.c:79
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr ""
 "Para ler e armacenar correo local en ficheiros spool est�ndar de tipo mbox."
 
-#: camel/providers/local/camel-local-store.c:127
-#: camel/providers/local/camel-spool-store.c:111
+#: camel/providers/local/camel-local-store.c:132
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "A ra�z de almacenamento %s non � unha ruta absoluta"
 
-#: camel/providers/local/camel-local-store.c:134
+#: camel/providers/local/camel-local-store.c:139
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "O ra�z de armacenamento %s non � un directorio normal."
 
-#: camel/providers/local/camel-local-store.c:142
-#: camel/providers/local/camel-local-store.c:158
+#: camel/providers/local/camel-local-store.c:147
+#: camel/providers/local/camel-local-store.c:163
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Non � posible obter o cartafol: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:173
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "Os armacenamentos locais non te�en un inbox"
 
-#: camel/providers/local/camel-local-store.c:183
+#: camel/providers/local/camel-local-store.c:190
 #, c-format
 msgid "Local mail file %s"
 msgstr "Ficheiro local de correo %s"
 
-#: camel/providers/local/camel-local-store.c:237
+#: camel/providers/local/camel-local-store.c:247
 #, 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:279
+#: camel/providers/local/camel-local-store.c:289
 #, 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:289
+#: camel/providers/local/camel-local-store.c:299
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Non foi posible borrar o ficheiro de �ndice de cartafol `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:417
-#: camel/providers/local/camel-spool-summary.c:1153
+#: camel/providers/local/camel-local-summary.c:418
+#: camel/providers/local/camel-spool-summary.c:1158
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Incapaz de engadir a mensaxe ao resumo: motivo desco�ecido"
 
-#: camel/providers/local/camel-maildir-folder.c:176
+#: camel/providers/local/camel-maildir-folder.c:181
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Non se pode engadir a mensaxe ao cartafol maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:201
-#: camel/providers/local/camel-maildir-folder.c:213
-#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:206
+#: camel/providers/local/camel-maildir-folder.c:218
+#: camel/providers/local/camel-maildir-folder.c:226
 #: camel/providers/local/camel-mbox-folder.c:328
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-mh-folder.c:204
 #: camel/providers/local/camel-mh-folder.c:212
-#: camel/providers/local/camel-spool-folder.c:532
+#: camel/providers/local/camel-spool-folder.c:537
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -5945,19 +6352,19 @@ msgstr ""
 "Non � posible obter a mensaxe: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:206
 #: camel/providers/local/camel-mbox-folder.c:328
 #: camel/providers/local/camel-mh-folder.c:195
-#: camel/providers/local/camel-spool-folder.c:532
+#: camel/providers/local/camel-spool-folder.c:537
 msgid "No such message"
 msgstr "Non existe a mensaxe"
 
-#: camel/providers/local/camel-maildir-folder.c:222
+#: camel/providers/local/camel-maildir-folder.c:227
 #: camel/providers/local/camel-mh-folder.c:213
 msgid "Invalid message contents"
 msgstr "Contido da mensaxe non v�lido"
 
-#: camel/providers/local/camel-maildir-store.c:103
+#: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
@@ -5967,14 +6374,14 @@ msgstr ""
 "Non � posible abrir o cartafol `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "O cartafol `%s' non existe."
 
-#: camel/providers/local/camel-maildir-store.c:114
+#: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
@@ -5984,23 +6391,23 @@ msgstr ""
 "Non foi posible crear o cartafol `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:129
+#: camel/providers/local/camel-maildir-store.c:132
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' non � un directorio maildir."
 
-#: camel/providers/local/camel-maildir-store.c:165
-#: camel/providers/local/camel-maildir-store.c:202
+#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:204
 #: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Non foi posible borrar o cartafol `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:166
+#: camel/providers/local/camel-maildir-store.c:168
 msgid "not a maildir directory"
 msgstr "non � un directorio maildir."
 
-#: camel/providers/local/camel-maildir-store.c:276
+#: camel/providers/local/camel-maildir-store.c:331
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Non foi posible examina-lo cartafol `%s': %s"
@@ -6012,13 +6419,13 @@ msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Non se pode abri-la ruta do directorio maildir: %s: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:152
-#: camel/providers/local/camel-spool-folder.c:268
+#: camel/providers/local/camel-spool-folder.c:273
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Non se pode crear bloqueo de cartafol en %s: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:209
-#: camel/providers/local/camel-spool-folder.c:409
+#: camel/providers/local/camel-spool-folder.c:414
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Non se pode abri-la caixa do correo: %s: %s\n"
@@ -6031,9 +6438,9 @@ msgstr "Non se pode engadir a mensaxe ao ficheiro mbox: %s: %s"
 #: camel/providers/local/camel-mbox-folder.c:344
 #: camel/providers/local/camel-mbox-folder.c:376
 #: camel/providers/local/camel-mbox-folder.c:389
-#: camel/providers/local/camel-spool-folder.c:548
-#: camel/providers/local/camel-spool-folder.c:580
-#: camel/providers/local/camel-spool-folder.c:593
+#: camel/providers/local/camel-spool-folder.c:553
+#: camel/providers/local/camel-spool-folder.c:585
+#: camel/providers/local/camel-spool-folder.c:598
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -6043,12 +6450,12 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-mbox-folder.c:377
-#: camel/providers/local/camel-spool-folder.c:581
+#: camel/providers/local/camel-spool-folder.c:586
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "O cartafol parece estar corrompido sen recuperaci�n posible."
 
 #: camel/providers/local/camel-mbox-folder.c:390
-#: camel/providers/local/camel-spool-folder.c:594
+#: camel/providers/local/camel-spool-folder.c:599
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Contrucci�n da mensaxe fallida: �mailbox corrompido?"
 
@@ -6094,16 +6501,20 @@ msgstr "O cartafol `%s' non est� baleiro. Non borrado."
 #. FIXME: If there is a failure, it shouldn't clear the summary and restart,
 #. it should try and merge the summary info's.  This is a bit tricky.
 #: camel/providers/local/camel-mbox-summary.c:249
-#: camel/providers/local/camel-spool-summary.c:379
-msgid "Summarising folder"
-msgstr "Resumindo cartafol"
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:936
+#, fuzzy
+msgid "Storing folder"
+msgstr "Sincronizando cartafol"
 
 #: camel/providers/local/camel-mbox-summary.c:254
-#: camel/providers/local/camel-spool-summary.c:384
-#, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
+#, fuzzy, c-format
+msgid "Could not open folder: %s: %s"
 msgstr ""
-"Non foi posible abir o cartafol: %s: resumindo desde a posici�n %ld: %s"
+"Non � posible abrir o cartafol `%s':\n"
+"%s"
 
 #: camel/providers/local/camel-mbox-summary.c:296
 #: camel/providers/local/camel-spool-summary.c:426
@@ -6113,22 +6524,18 @@ msgstr ""
 "Erro grave do analizador de correo preto da posici�n %ld no cartafol %s"
 
 #: camel/providers/local/camel-mbox-summary.c:371
-#, c-format
-msgid "Cannot summarize folder: %s: %s"
-msgstr "Non � posible resumir o cartafol: %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:644
-#: camel/providers/local/camel-spool-summary.c:931
-msgid "Synchronising folder"
-msgstr "Sincronizando cartafol"
+#, fuzzy, c-format
+msgid "Cannot check folder: %s: %s"
+msgstr "Non � posible obter o cartafol: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:507
 #: camel/providers/local/camel-mbox-summary.c:708
-#, c-format
-msgid "Could not open folder to summarize: %s: %s"
-msgstr "Non foi posible abrir o cartafol para o resumir: %s: %s"
+#: camel/providers/local/camel-spool-summary.c:649
+#, fuzzy, c-format
+msgid "Could not open file: %s: %s"
+msgstr ""
+"Non foi posible abrir o ficheiro %s:\n"
+"%s"
 
 #: camel/providers/local/camel-mbox-summary.c:524
 #: camel/providers/local/camel-spool-summary.c:673
@@ -6142,8 +6549,8 @@ msgstr "Non � posible abrir a caixa de correo temporal: %s"
 #: camel/providers/local/camel-mbox-summary.c:754
 #: camel/providers/local/camel-spool-summary.c:698
 #: camel/providers/local/camel-spool-summary.c:706
-#: camel/providers/local/camel-spool-summary.c:974
-#: camel/providers/local/camel-spool-summary.c:982
+#: camel/providers/local/camel-spool-summary.c:979
+#: camel/providers/local/camel-spool-summary.c:987
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "O resumo e o cartafol non concordan, mesmo logo de sincronizar"
 
@@ -6154,14 +6561,14 @@ msgid "Error writing to temp mailbox: %s"
 msgstr "Erro ao escribir � caixa de correo temporal: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:617
-#: camel/providers/local/camel-spool-summary.c:767
+#: camel/providers/local/camel-spool-summary.c:772
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Erro escribindo � caixa de correo temporal: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:635
 #: camel/providers/local/camel-mbox-summary.c:804
-#: camel/providers/local/camel-spool-summary.c:1032
+#: camel/providers/local/camel-spool-summary.c:1037
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Non foi posible pechar o cartafol orixe %s: %s"
@@ -6178,7 +6585,7 @@ msgstr "Non foi posible renomear o cartafol: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:878
 #: camel/providers/local/camel-spool-summary.c:545
-#: camel/providers/local/camel-spool-summary.c:1106
+#: camel/providers/local/camel-spool-summary.c:1111
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Erro desco�ecido: %s"
@@ -6198,60 +6605,66 @@ msgstr "`%s' non � un directorio."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Non foi posible abrir a ruta do directorio MH: %s: %s"
 
-#: camel/providers/local/camel-spool-folder.c:465
+#: camel/providers/local/camel-spool-folder.c:470
 #, c-format
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "Non se pode engadir a mensaxe ao ficheiro de spool: %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:132
+#: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Spool `%s' does not exist or is not a regular file"
 msgstr "O spool `%s' non existe ou non � un ficheiro normal"
 
-#: camel/providers/local/camel-spool-store.c:159
+#: camel/providers/local/camel-spool-store.c:142
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "O cartafol `%s/%s' non existe."
 
-#: camel/providers/local/camel-spool-store.c:184
+#: camel/providers/local/camel-spool-store.c:164
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Ficheiro spool de correo %s"
 
-#: camel/providers/local/camel-spool-store.c:220
+#: camel/providers/local/camel-spool-store.c:210
 msgid "Spool folders cannot be renamed"
 msgstr "Non se pode renomear os cartafoles spool"
 
-#: camel/providers/local/camel-spool-store.c:228
+#: camel/providers/local/camel-spool-store.c:218
 msgid "Spool folders cannot be deleted"
 msgstr "Os cartafoles spool non se poden eliminar"
 
+#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
+#. it should try and merge the summary info's.  This is a bit tricky.
+#: camel/providers/local/camel-spool-summary.c:379
+msgid "Summarising folder"
+msgstr "Resumindo cartafol"
+
+#: camel/providers/local/camel-spool-summary.c:384
+#, c-format
+msgid "Could not open folder: %s: summarising from position %ld: %s"
+msgstr ""
+"Non foi posible abir o cartafol: %s: resumindo desde a posici�n %ld: %s"
+
 #: camel/providers/local/camel-spool-summary.c:498
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "Non � posible resumir o cartafol: %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:649
-#: camel/providers/local/camel-spool-summary.c:936
-#, c-format
-msgid "Could not open folder to summarise: %s: %s"
-msgstr "Non foi posible abrir o cartafol para o resume: %s: %s"
-
-#: camel/providers/local/camel-spool-summary.c:784
-#: camel/providers/local/camel-spool-summary.c:793
-#: camel/providers/local/camel-spool-summary.c:802
+#: camel/providers/local/camel-spool-summary.c:789
+#: camel/providers/local/camel-spool-summary.c:798
+#: camel/providers/local/camel-spool-summary.c:807
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Non foi posible sincroniza-lo cartafol temporal %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:817
+#: camel/providers/local/camel-spool-summary.c:822
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Non se puido sincroniza-lo cartafol spool %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:847
-#: camel/providers/local/camel-spool-summary.c:865
-#: camel/providers/local/camel-spool-summary.c:877
+#: camel/providers/local/camel-spool-summary.c:852
+#: camel/providers/local/camel-spool-summary.c:870
+#: camel/providers/local/camel-spool-summary.c:882
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -6260,6 +6673,11 @@ msgstr ""
 "Non foi posible sincronizar o cartafol spool %s: %s\n"
 "O cartafol pode estar corrupto, copia gardada en `%s'"
 
+#: camel/providers/local/camel-spool-summary.c:941
+#, fuzzy, c-format
+msgid "Could not file: %s: %s"
+msgstr "Non foi posible cargar %s: %s"
+
 #: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
@@ -6337,31 +6755,31 @@ msgstr "Recibindo o resumo de POP"
 msgid "Could not check POP server for new messages: %s"
 msgstr "Non foi posible comprobar se hai mensaxes novas no servidor POP: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:235
+#: camel/providers/pop3/camel-pop3-folder.c:242
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 "Non foi posible abrir o cartafol: o listado de mensaxes era incompleto."
 
-#: camel/providers/pop3/camel-pop3-folder.c:259
+#: camel/providers/pop3/camel-pop3-folder.c:266
 msgid "Expunging deleted messages"
 msgstr "Eliminando as mensaxes borradas"
 
-#: camel/providers/pop3/camel-pop3-folder.c:335
+#: camel/providers/pop3/camel-pop3-folder.c:342
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "Non foi posible recoller a mensaxe: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:351
+#: camel/providers/pop3/camel-pop3-folder.c:358
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Non foi posible recibir a mensaxe do servidor POP %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:374
+#: camel/providers/pop3/camel-pop3-folder.c:381
 #, c-format
 msgid "No message with uid %s"
 msgstr "Non existe a mensaxe con UID %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:378
+#: camel/providers/pop3/camel-pop3-folder.c:385
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Recibindo a mensaxe POP %d"
@@ -6374,20 +6792,20 @@ msgstr "Armacenamento da mensaxe"
 msgid "Leave messages on server"
 msgstr "Deixar as mensaxes no servidor"
 
-#: camel/providers/pop3/camel-pop3-provider.c:41
+#: camel/providers/pop3/camel-pop3-provider.c:42
 #, c-format
 msgid "Delete after %s day(s)"
 msgstr "Borrar despois de %s d�a(s)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:49 mail/mail-config.glade.h:53
+#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:54
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:51
+#: camel/providers/pop3/camel-pop3-provider.c:53
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "Para conectarse a servidores POP e descargar correo deles."
 
-#: camel/providers/pop3/camel-pop3-provider.c:68
+#: camel/providers/pop3/camel-pop3-provider.c:70
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -6395,7 +6813,7 @@ msgstr ""
 "Esta opci�n conectarase � servidor POP usando un contrasinal sen cifrar. "
 "Esta � a �nica opci�n que soportan moitos servidores POP."
 
-#: camel/providers/pop3/camel-pop3-provider.c:78
+#: camel/providers/pop3/camel-pop3-provider.c:80
 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 "
@@ -6405,7 +6823,7 @@ 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-provider.c:90
+#: camel/providers/pop3/camel-pop3-provider.c:92
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
@@ -6467,8 +6885,13 @@ msgstr ""
 msgid "No such folder `%s'."
 msgstr "Non existe o cartafol `%s'."
 
+#: camel/providers/pop3/camel-pop3-store.c:567
+#, fuzzy, c-format
+msgid "Unexpected response from POP server: %s"
+msgstr "Resposta inesperada do servidor IMAP: %s"
+
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:73
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -6523,7 +6946,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Entrega de correo a trav�s do programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:66
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -6682,7 +7105,7 @@ msgstr "Non se pode enviar a mensaxe: enderezo do autor non definido."
 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:595 mail/mail-ops.c:595
+#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:553
 msgid "Sending message"
 msgstr "Enviando a mensaxe"
 
@@ -6756,33 +7179,33 @@ msgstr "A petici�n DATA expirou: %s: correo non enviado"
 msgid "DATA response error: %s: mail not sent"
 msgstr "Erro na resposta DATA: %s: correo non enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1006
-#: camel/providers/smtp/camel-smtp-transport.c:1024
+#: camel/providers/smtp/camel-smtp-transport.c:1008
+#: camel/providers/smtp/camel-smtp-transport.c:1026
 #, 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:1043
+#: camel/providers/smtp/camel-smtp-transport.c:1045
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr "Erro na resposta DATA: remate da mensaxe: %s: correo non enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1069
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "A petici�n RSET expirou: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1086
+#: camel/providers/smtp/camel-smtp-transport.c:1088
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Erro na resposta RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1109
+#: camel/providers/smtp/camel-smtp-transport.c:1111
 #, 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:1128
+#: camel/providers/smtp/camel-smtp-transport.c:1130
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Erro na resposta QUIT: %s: non fatal"
@@ -6845,52 +7268,52 @@ msgstr "Tipo MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Suxerir que se amose o anexo automaticamente"
 
-#: composer/e-msg-composer-hdrs.c:327
+#: composer/e-msg-composer-hdrs.c:326
 msgid "Click here for the address book"
 msgstr "Prema aqu� para o libro de enderezos"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:358
+#: composer/e-msg-composer-hdrs.c:357
 msgid "From:"
 msgstr "De:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:363
 msgid "Reply-To:"
 msgstr "Responder-A:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:375
+#: composer/e-msg-composer-hdrs.c:374
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:388
 msgid "To:"
 msgstr "Para:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:389
 msgid "Enter the recipients of the message"
 msgstr "Introduza os destinatarios da mensaxe"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:392
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:393
 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:397
+#: composer/e-msg-composer-hdrs.c:396
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:397
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -6903,16 +7326,7 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Anexar un ficheiro"
 
-#: composer/e-msg-composer.c:670
-#, c-format
-msgid ""
-"Could not open file %s:\n"
-"%s"
-msgstr ""
-"Non foi posible abrir o ficheiro %s:\n"
-"%s"
-
-#: composer/e-msg-composer.c:683
+#: composer/e-msg-composer.c:676
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -6921,29 +7335,29 @@ msgstr ""
 "Erro ao le-lo ficheiro %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:865
+#: composer/e-msg-composer.c:858
 msgid "Save as..."
 msgstr "Gardar como..."
 
-#: composer/e-msg-composer.c:874
+#: composer/e-msg-composer.c:867
 msgid "Warning!"
 msgstr "�Aviso!"
 
-#: composer/e-msg-composer.c:878
+#: composer/e-msg-composer.c:871
 msgid "File exists, overwrite?"
 msgstr "O ficheiro existe, �sobrescribir?"
 
-#: composer/e-msg-composer.c:900
+#: composer/e-msg-composer.c:893
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Erro ao gardar o ficheiro: %s"
 
-#: composer/e-msg-composer.c:919
+#: composer/e-msg-composer.c:912
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erro ao cargar o ficheiro: %s"
 
-#: composer/e-msg-composer.c:990
+#: composer/e-msg-composer.c:983
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -6951,16 +7365,16 @@ msgstr ""
 "Incapaz de abrir o cartafol de borradores para esta conta.\n"
 "�Gostar�alle usar o cartafol de borradores por defecto?"
 
-#: composer/e-msg-composer.c:1043
+#: composer/e-msg-composer.c:1036
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Erro ao acceder ao ficheiro: %s"
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1044
 msgid "Unable to retrieve message from editor"
 msgstr "Non foi posible recibir a mensaxe do editor"
 
-#: composer/e-msg-composer.c:1057
+#: composer/e-msg-composer.c:1050
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -6969,7 +7383,7 @@ msgstr ""
 "Non � posible desprazarse no ficheiro: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1063
+#: composer/e-msg-composer.c:1056
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -6978,7 +7392,7 @@ msgstr ""
 "Non foi posible trunca-lo ficheiro: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1072
+#: composer/e-msg-composer.c:1065
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -6987,15 +7401,16 @@ msgstr ""
 "Erro ao autogardar a mensaxe: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1172
+#: composer/e-msg-composer.c:1165
+#, fuzzy
 msgid ""
-"Evolution has found unsaved files from a previous session.\n"
+"Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 "Evolution atopou ficheiros non gravados dunha sesi�n anterior.\n"
 "�Gostar�alle probar a recuperalos?"
 
-#: composer/e-msg-composer.c:1320
+#: composer/e-msg-composer.c:1313
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -7005,28 +7420,28 @@ msgstr ""
 "\n"
 "�Desexa gardar os cambios?"
 
-#: composer/e-msg-composer.c:1327 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:217
-msgid "Evolution"
-msgstr "Evolution"
+#: composer/e-msg-composer.c:1320
+#, fuzzy
+msgid "Warning: Modified Message"
+msgstr "Mensaxe Remitida"
 
-#: composer/e-msg-composer.c:1350
+#: composer/e-msg-composer.c:1343
 msgid "Open file"
 msgstr "Abrir ficheiro"
 
-#: composer/e-msg-composer.c:1499
+#: composer/e-msg-composer.c:1492
 msgid "Insert File"
 msgstr "Inserir Ficheiro"
 
-#: composer/e-msg-composer.c:1875 composer/e-msg-composer.c:2316
+#: composer/e-msg-composer.c:1868 composer/e-msg-composer.c:2314
 msgid "Compose a message"
 msgstr "Compo�er unha mensaxe"
 
-#: composer/e-msg-composer.c:2406
+#: composer/e-msg-composer.c:2404
 msgid "Could not create composer window."
 msgstr "Non foi posible crear a fiestra do compositor."
 
-#: composer/evolution-composer.c:359
+#: composer/evolution-composer.c:349
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -7034,10 +7449,14 @@ msgstr ""
 "Non foi posible crear a fiestra do compositor, porque a�nda\n"
 "non configurou ningunha identidade no compo�ente de correo."
 
-#: composer/evolution-composer.c:374
+#: composer/evolution-composer.c:364
 msgid "Cannot initialize Evolution's composer."
 msgstr "Non foi posible inicializar o compositor de Evolution."
 
+#: data/evolution.desktop.in.h:1 shell/main.c:76
+msgid "Evolution"
+msgstr "Evolution"
+
 #: data/evolution.desktop.in.h:2
 msgid "The Evolution groupware suite"
 msgstr "A suite de traballo en grupo Evolution"
@@ -7082,82 +7501,99 @@ msgstr "O asunto cont�n"
 msgid "Subject does not contain"
 msgstr "O asunto non cont�n"
 
-#. strptime format for a date.
-#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:131
-#: e-util/e-time-utils.c:243
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1531
-msgid "%m/%d/%Y"
+#. strptime format of a weekday, a date and a time,
+#. in 12-hour format, without seconds.
+#: e-util/e-time-utils.c:168 e-util/e-time-utils.c:359
+msgid "%a %m/%d/%Y %I:%M %p"
+msgstr "%a %d/%m/%Y %I:%M %p"
+
+#. strptime format of a weekday, a date and a time,
+#. in 24-hour format, without seconds.
+#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:350
+msgid "%a %m/%d/%Y %H:%M"
+msgstr "%a %d/%m/%Y %H:%M"
+
+#. strptime format of a weekday, a date and a time,
+#. in 12-hour format, without minutes or seconds.
+#: e-util/e-time-utils.c:178
+#, fuzzy
+msgid "%a %m/%d/%Y %I %p"
+msgstr "%a %d/%m/%Y %I:%M %p"
+
+#. strptime format of a weekday, a date and a time,
+#. in 24-hour format, without minutes or seconds.
+#: e-util/e-time-utils.c:183
+#, fuzzy
+msgid "%a %m/%d/%Y %H"
+msgstr "%a %d/%m/%Y %H:%M"
+
+#. strptime format of a date and a time, in 12-hour format.
+#: e-util/e-time-utils.c:194
+#, fuzzy
+msgid "%m/%d/%Y %I:%M:%S %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
+
+#. strptime format of a date and a time, in 24-hour format.
+#: e-util/e-time-utils.c:198
+#, fuzzy
+msgid "%m/%d/%Y %H:%M:%S"
+msgstr "%a %d/%m/%Y %H:%M:%S"
+
+#. strptime format of a date and a time, in 12-hour format,
+#. without seconds.
+#: e-util/e-time-utils.c:203
+#, fuzzy
+msgid "%m/%d/%Y %I:%M %p"
+msgstr "%a %d/%m/%Y %I:%M %p"
+
+#. strptime format of a date and a time, in 24-hour format,
+#. without seconds.
+#: e-util/e-time-utils.c:208
+#, fuzzy
+msgid "%m/%d/%Y %H:%M"
+msgstr "%a %d/%m/%Y %H:%M"
+
+#. strptime format of a date and a time, in 12-hour format,
+#. without minutes or seconds.
+#: e-util/e-time-utils.c:213
+#, fuzzy
+msgid "%m/%d/%Y %I %p"
+msgstr "%a %d/%m/%Y %I:%M %p"
+
+#. strptime format of a date and a time, in 24-hour format,
+#. without minutes or seconds.
+#: e-util/e-time-utils.c:218
+#, fuzzy
+msgid "%m/%d/%Y %H"
 msgstr "%d/%m/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:277
-#: e-util/e-time-utils.c:368
+#: e-util/e-time-utils.c:300 e-util/e-time-utils.c:399
 msgid "%I:%M:%S %p"
 msgstr "%H:%M:%S"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:280
-#: e-util/e-time-utils.c:360
+#: e-util/e-time-utils.c:304 e-util/e-time-utils.c:391
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
-#. strptime format for time of day, without seconds, 12-hour format.
-#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:284
-#: e-util/e-time-utils.c:365 widgets/misc/e-dateedit.c:1339
-#: widgets/misc/e-dateedit.c:1566
+#. strptime format for time of day, without seconds,
+#. in 12-hour format.
+#: e-util/e-time-utils.c:309 e-util/e-time-utils.c:396
+#: widgets/misc/e-dateedit.c:1385 widgets/misc/e-dateedit.c:1612
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
-#. strptime format for hour and AM/PM
-#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:287
-msgid "%I %p"
-msgstr "%I %p"
-
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:111 e-util/e-time-utils.c:290
-#: e-util/e-time-utils.c:357 widgets/misc/e-dateedit.c:1336
-#: widgets/misc/e-dateedit.c:1563
+#: e-util/e-time-utils.c:313 e-util/e-time-utils.c:388
+#: widgets/misc/e-dateedit.c:1382 widgets/misc/e-dateedit.c:1609
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#. This is the second-choice date format for the locale, which we use
-#. if previous attempts to parse the date string failed.
-#: e-util/e-time-utils.c:247
-msgid "%d/%m/%Y"
-msgstr "%d/%m/%Y"
-
-#. This is the third-choice date format for the locale, which we use
-#. if previous attempts to parse the date string failed.
-#: e-util/e-time-utils.c:251
-msgid "%Y/%m/%d"
-msgstr "%Y/%m/%d"
-
-#. This is the final-choice date format for the locale, which we use
-#. if previous attempts to parse the date string failed.
-#: e-util/e-time-utils.c:255
-#, c-format
-msgid "%x"
-msgstr "%x"
-
-#. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:314
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
-msgid "%a %m/%d/%Y"
-msgstr "%a %d/%m/%Y"
-
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:319
-msgid "%a %m/%d/%Y %H:%M"
-msgstr "%a %d/%m/%Y %H:%M"
-
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:328
-msgid "%a %m/%d/%Y %I:%M %p"
-msgstr "%a %d/%m/%Y %I:%M %p"
+#. strptime format for hour and AM/PM, 12-hour format.
+#: e-util/e-time-utils.c:317
+msgid "%I %p"
+msgstr "%I %p"
 
 #: filter/filter-datespec.c:80
 msgid "year"
@@ -7248,6 +7684,12 @@ msgstr "unha hora que especifique"
 msgid "a time relative to the current time"
 msgstr "unha hora relativa � hora actual"
 
+#. The dialog
+#: filter/filter-datespec.c:394
+#, fuzzy
+msgid "Select a time to compare against"
+msgstr "Seleccionar un Fuso Horario"
+
 #. The label
 #: filter/filter-datespec.c:428
 msgid "Compare against"
@@ -7278,11 +7720,11 @@ msgid "Filter Rules"
 msgstr "Regras de Filtrado"
 
 #. and now for the action area
-#: filter/filter-filter.c:452
+#: filter/filter-filter.c:487
 msgid "Then"
 msgstr "Ent�n"
 
-#: filter/filter-filter.c:466
+#: filter/filter-filter.c:501
 msgid "Add action"
 msgstr "Engadir acci�n"
 
@@ -7294,8 +7736,8 @@ 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:232 filter/vfolder-rule.c:319
-#: mail/mail-account-gui.c:820
+#: filter/filter-folder.c:232 filter/vfolder-rule.c:356
+#: mail/mail-account-gui.c:822
 msgid "Select Folder"
 msgstr "Seleccionar Cartafol"
 
@@ -7320,39 +7762,39 @@ msgstr ""
 msgid "Test"
 msgstr "Proba"
 
-#: filter/filter-rule.c:626
+#: filter/filter-rule.c:696
 msgid "Rule name: "
 msgstr "Nome da regra: "
 
-#: filter/filter-rule.c:630
+#: filter/filter-rule.c:700
 msgid "Untitled"
 msgstr "Sen t�tulo"
 
-#: filter/filter-rule.c:647
+#: filter/filter-rule.c:717
 msgid "If"
 msgstr "Se"
 
-#: filter/filter-rule.c:665
+#: filter/filter-rule.c:735
 msgid "Execute actions"
 msgstr "Executar acci�ns"
 
-#: filter/filter-rule.c:669
+#: filter/filter-rule.c:739
 msgid "if all criteria are met"
 msgstr "se se cumpren t�dolos criterios"
 
-#: filter/filter-rule.c:674
+#: filter/filter-rule.c:744
 msgid "if any criteria are met"
 msgstr "se se cumpre alg�n criterio"
 
-#: filter/filter-rule.c:685
+#: filter/filter-rule.c:755
 msgid "Add criterion"
 msgstr "Engadir criterio"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:840
 msgid "incoming"
 msgstr "entrante"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:840
 msgid "outgoing"
 msgstr "sa�nte"
 
@@ -7396,193 +7838,192 @@ msgstr "con todos os cartafoles locais e cos remotos activos"
 msgid "with all local folders"
 msgstr "con todos os cartafoles locais"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
+#: filter/libfilter-i18n.h:3
 msgid "Assign Color"
 msgstr "Asignar Cor"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Asignar Puntuaci�n"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
 msgid "Attachments"
 msgstr "Anexos"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "cont�n"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Copiar � Cartafol"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Data de recepci�n"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Data de env�o"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Eliminada"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:13
+msgid "does not contain"
+msgstr "non cont�n"
+
+#: filter/libfilter-i18n.h:14
+msgid "does not end with"
+msgstr "non remata en"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not exist"
+msgstr "non existe"
+
+#: filter/libfilter-i18n.h:16
+msgid "does not sound like"
+msgstr "non soa como"
+
+#: filter/libfilter-i18n.h:17
+msgid "does not start with"
+msgstr "non comeza por"
+
+#: filter/libfilter-i18n.h:18
 msgid "Do Not Exist"
 msgstr "Non Existe"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:19
 msgid "Draft"
 msgstr "Borrador"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:20
+msgid "ends with"
+msgstr "remata en"
+
+#: filter/libfilter-i18n.h:21
 msgid "Exist"
 msgstr "Existe"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:22
+msgid "exists"
+msgstr "existe"
+
+#: filter/libfilter-i18n.h:23
 msgid "Expression"
 msgstr "Expresi�n"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:24
 msgid "Important"
 msgstr "Importante"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:25
+msgid "is"
+msgstr "�"
+
+#: filter/libfilter-i18n.h:26
+msgid "is greater than"
+msgstr "� maior que"
+
+#: filter/libfilter-i18n.h:27
+msgid "is less than"
+msgstr "� menor que"
+
+#: filter/libfilter-i18n.h:28
+msgid "is not"
+msgstr "non �"
+
+#: filter/libfilter-i18n.h:29
 msgid "Mailing list"
 msgstr "Lista de Correo"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr "Corpo da Mensaxe"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:31
 msgid "Message Header"
 msgstr "Cabeceira da Mensaxe"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr "Recibiuse a mensaxe"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr "Enviouse a mensaxe"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "Mover a un Cartafol"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:35
+msgid "on or after"
+msgstr "en ou despois"
+
+#: filter/libfilter-i18n.h:36
+msgid "on or before"
+msgstr "en ou antes"
+
+#: filter/libfilter-i18n.h:37
 msgid "Read"
 msgstr "Ler"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "Destinatarios"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr "Busca por Expresi�n Regular"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr "Respondido a"
 
-#: filter/libfilter-i18n.h:25 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "Puntuaci�n"
 
-#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1114
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1251
 msgid "Sender"
 msgstr "Autor"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:43
 msgid "Set Status"
 msgstr "Establecer Estado"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:44
 msgid "Size (kB)"
 msgstr "Tama�o (kB)"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:45
+msgid "sounds like"
+msgstr "soa como"
+
+#: filter/libfilter-i18n.h:46
 msgid "Source Account"
 msgstr "Conta Fonte"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:47
 msgid "Specific header"
 msgstr "Cabeceira espec�fica"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:48
+msgid "starts with"
+msgstr "comeza por"
+
+#: filter/libfilter-i18n.h:50
 msgid "Stop Processing"
 msgstr "Parar o Procesamento"
 
-#: filter/libfilter-i18n.h:33 mail/mail-format.c:889
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:917
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Asunto"
 
-#: filter/libfilter-i18n.h:36
-msgid "contains"
-msgstr "cont�n"
-
-#: filter/libfilter-i18n.h:37
-msgid "does not contain"
-msgstr "non cont�n"
-
-#: filter/libfilter-i18n.h:38
-msgid "does not end with"
-msgstr "non remata en"
-
-#: filter/libfilter-i18n.h:39
-msgid "does not exist"
-msgstr "non existe"
-
-#: filter/libfilter-i18n.h:40
-msgid "does not sound like"
-msgstr "non soa como"
-
-#: filter/libfilter-i18n.h:41
-msgid "does not start with"
-msgstr "non comeza por"
-
-#: filter/libfilter-i18n.h:42
-msgid "ends with"
-msgstr "remata en"
-
-#: filter/libfilter-i18n.h:43
-msgid "exists"
-msgstr "existe"
-
-#: filter/libfilter-i18n.h:44
-msgid "is greater than"
-msgstr "� maior que"
-
-#: filter/libfilter-i18n.h:45
-msgid "is less than"
-msgstr "� menor que"
-
-#: filter/libfilter-i18n.h:46
-msgid "is not"
-msgstr "non �"
-
-#: filter/libfilter-i18n.h:47
-msgid "is"
-msgstr "�"
-
-#: filter/libfilter-i18n.h:48
-msgid "on or after"
-msgstr "en ou despois"
-
-#: filter/libfilter-i18n.h:49
-msgid "on or before"
-msgstr "en ou antes"
-
-#: filter/libfilter-i18n.h:50
-msgid "sounds like"
-msgstr "soa como"
-
-#: filter/libfilter-i18n.h:51
-msgid "starts with"
-msgstr "comeza por"
-
 #: filter/libfilter-i18n.h:52
 msgid "was after"
 msgstr "foi posterior a"
@@ -7599,7 +8040,7 @@ msgstr "Regras"
 msgid "Add Rule"
 msgstr "Engadir Regra"
 
-#: filter/rule-editor.c:299
+#: filter/rule-editor.c:301
 msgid "Edit Rule"
 msgstr "Editar Regra"
 
@@ -7607,7 +8048,7 @@ msgstr "Editar Regra"
 msgid "Score Rules"
 msgstr "Regras de Puntuaci�n"
 
-#: filter/vfolder-rule.c:198
+#: filter/vfolder-rule.c:206
 msgid "Oops.  You need to to specify at least one folder as a source."
 msgstr "Oops.  Necesita especificar polo menos un cartafol como fonte."
 
@@ -7615,40 +8056,34 @@ 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:97 importers/netscape-importer.c:106
-#: importers/pine-importer.c:101
+#: importers/elm-importer.c:97 importers/netscape-importer.c:108
+#: importers/pine-importer.c:102
 msgid "Importing..."
 msgstr "Importando..."
 
-#: importers/elm-importer.c:99 importers/netscape-importer.c:108
-#: importers/pine-importer.c:103
+#: importers/elm-importer.c:99 importers/netscape-importer.c:110
+#: importers/pine-importer.c:104
 msgid "Please wait"
 msgstr "Agarde, por favor"
 
-#: importers/elm-importer.c:171 importers/netscape-importer.c:639
-#: importers/pine-importer.c:438
+#: importers/elm-importer.c:171 importers/netscape-importer.c:708
+#: importers/pine-importer.c:369
 #, c-format
 msgid "Importing %s as %s"
 msgstr "Importando %s coma %s"
 
-#: importers/elm-importer.c:377 importers/netscape-importer.c:732
-#: importers/pine-importer.c:571
+#: importers/elm-importer.c:377 importers/netscape-importer.c:801
+#: importers/pine-importer.c:506
 #, c-format
 msgid "Scanning %s"
 msgstr "Examinando %s"
 
-#: importers/elm-importer.c:526 importers/evolution-gnomecard-importer.c:228
-#: importers/netscape-importer.c:903 importers/pine-importer.c:732
-#: shell/e-shell-importer.c:684 shell/importer/intelligent.c:194
-msgid "Import"
-msgstr "Importar"
-
-#: importers/elm-importer.c:531 importers/netscape-importer.c:908
-#: importers/pine-importer.c:737 mail/component-factory.c:96
+#: importers/elm-importer.c:528 importers/netscape-importer.c:974
+#: importers/pine-importer.c:669 mail/component-factory.c:96
 msgid "Mail"
 msgstr "Correo"
 
-#: importers/elm-importer.c:554
+#: importers/elm-importer.c:548
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -7656,15 +8091,20 @@ msgstr ""
 "Evolution atopou ficheiros de correo de Elm.\n"
 "�Gostar�alle importalos a Evolution?"
 
-#: importers/elm-importer.c:583
-msgid "Elm mail"
-msgstr "Correo de Elm"
+#: importers/elm-importer.c:577
+msgid "Elm"
+msgstr ""
+
+#: importers/evolution-gnomecard-importer.c:230
+#, fuzzy
+msgid "GnomeCard:"
+msgstr "Tarxeta: "
 
-#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:742
+#: importers/evolution-gnomecard-importer.c:231 importers/pine-importer.c:674
 msgid "Addressbook"
 msgstr "Libro de Enderezos"
 
-#: importers/evolution-gnomecard-importer.c:253
+#: importers/evolution-gnomecard-importer.c:250
 msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
@@ -7672,23 +8112,23 @@ msgstr ""
 "Evolution atopou ficheiros GnomeCard.\n"
 "�Gostar�alle importalos a Evolution?"
 
-#: importers/netscape-importer.c:105
+#: importers/netscape-importer.c:107
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution est� importando os datos antigos de Netscape"
 
-#: importers/netscape-importer.c:835 importers/pine-importer.c:667
+#: importers/netscape-importer.c:904 importers/pine-importer.c:602
 msgid "Scanning directory"
 msgstr "Explorando o directorio"
 
-#: importers/netscape-importer.c:844
+#: importers/netscape-importer.c:913
 msgid "Starting import"
 msgstr "Comezando a importaci�n"
 
-#: importers/netscape-importer.c:913
+#: importers/netscape-importer.c:979
 msgid "Settings"
 msgstr "Opci�ns"
 
-#: importers/netscape-importer.c:938
+#: importers/netscape-importer.c:1000
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -7696,11 +8136,12 @@ msgstr ""
 "Evolution atopou ficheiros de correo de Netscape.\n"
 "�Gostar�alle importalos a Evolution?"
 
-#: importers/pine-importer.c:100
-msgid "Evolution is importer your old Pine data"
+#: importers/pine-importer.c:101
+#, fuzzy
+msgid "Evolution is importing your old Pine data"
 msgstr "Evolution est� importando os seus datos de Pine antigos"
 
-#: importers/pine-importer.c:768
+#: importers/pine-importer.c:695
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -7708,9 +8149,10 @@ msgstr ""
 "Evolution atopou ficheiros de correo de Pine.\n"
 "�Gostar�alle importalos a Evolution?"
 
-#: importers/pine-importer.c:796
-msgid "Pine mail"
-msgstr "Correo de Pine"
+#: importers/pine-importer.c:723
+#, fuzzy
+msgid "Pine"
+msgstr "Imprimir"
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:1
 msgid "Evolution component for handling mail."
@@ -7737,14 +8179,10 @@ msgid "Factory for the Evolution composer."
 msgstr "F�brica para o compositor de Evolution."
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:7
-msgid "Factory for the Evolution mail component."
-msgstr "F�brica para o compo�ente de correo de Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
 msgid "Factory for the Mail Summary component."
 msgstr "F�brica para a compo�ente Resumo de Correo."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
 msgid "Mail configuration interface"
 msgstr "Interface de configuraci�n do correo"
 
@@ -7768,27 +8206,33 @@ msgstr "Cartafol de Lixo Virtual"
 msgid "This folder cannot contain messages."
 msgstr "Este cartafol non pode conter mensaxes."
 
-#: mail/component-factory.c:345
+#: mail/component-factory.c:356
 msgid "Properties..."
 msgstr "Propiedades..."
 
-#: mail/component-factory.c:345
+#: mail/component-factory.c:356
 msgid "Change this folder's properties"
 msgstr "Modificar as propiedades deste cartafol"
 
-#: mail/component-factory.c:767
+#: mail/component-factory.c:698
+msgid ""
+"Some of your mail settings seem corrupt, please check that everything is in "
+"order."
+msgstr ""
+
+#: mail/component-factory.c:812
 msgid "New Mail Message"
 msgstr "Nova Mensaxe de Correo"
 
-#: mail/component-factory.c:767
+#: mail/component-factory.c:812
 msgid "New _Mail Message"
 msgstr "Nova _Mensaxe"
 
-#: mail/component-factory.c:799
+#: mail/component-factory.c:843
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Non se pode inicializar o compo�ente de correo de Evolution."
 
-#: mail/component-factory.c:938
+#: mail/component-factory.c:1032
 msgid "Cannot register storage with shell"
 msgstr "Non se pode rexistrar o armacenamento co shell"
 
@@ -7801,129 +8245,159 @@ msgstr "Propiedades de \"%s\""
 msgid "Properties"
 msgstr "Propiedades"
 
-#: mail/folder-browser.c:229 mail/mail-display.c:275
+#: mail/folder-browser.c:262 mail/mail-display.c:275
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Non foi posible crear o directorio temporal: %s"
 
-#: mail/folder-browser.c:905
+#: mail/folder-browser.c:734
+#, c-format
+msgid "%d new"
+msgstr "%d nova(s)"
+
+#: mail/folder-browser.c:737 mail/folder-browser.c:742
+#: mail/folder-browser.c:746
+msgid ", "
+msgstr ", "
+
+#: mail/folder-browser.c:738
+#, c-format
+msgid "%d hidden"
+msgstr "%d oculta(s)"
+
+#: mail/folder-browser.c:743
+#, c-format
+msgid "%d selected"
+msgstr "%d seleccionada(s)"
+
+#: mail/folder-browser.c:748
+#, c-format
+msgid "%d unsent"
+msgstr "%d sen enviar"
+
+#: mail/folder-browser.c:750
+#, c-format
+msgid "%d total"
+msgstr "%d total"
+
+#: mail/folder-browser.c:993
 msgid "Create vFolder from Search"
 msgstr "Crear un CartafolV da Busca"
 
-#: mail/folder-browser.c:1250
+#: mail/folder-browser.c:1338
 msgid "VFolder on _Subject"
 msgstr "CartafolV polo A_sunto"
 
-#: mail/folder-browser.c:1253
+#: mail/folder-browser.c:1341
 msgid "VFolder on Se_nder"
 msgstr "CartafolV polo Au_tor"
 
-#: mail/folder-browser.c:1256
+#: mail/folder-browser.c:1344
 msgid "VFolder on _Recipients"
 msgstr "CartafolV polos _Destinatarios"
 
-#: mail/folder-browser.c:1259
+#: mail/folder-browser.c:1347
 msgid "VFolder on Mailing _List"
 msgstr "CartafolV pola _Lista de Correo"
 
-#: mail/folder-browser.c:1265
+#: mail/folder-browser.c:1353
 msgid "Filter on Sub_ject"
 msgstr "Filtrar polo As_unto"
 
-#: mail/folder-browser.c:1268
+#: mail/folder-browser.c:1356
 msgid "Filter on Sen_der"
 msgstr "Filtrar polo Au_tor"
 
-#: mail/folder-browser.c:1271
+#: mail/folder-browser.c:1359
 msgid "Filter on Re_cipients"
 msgstr "Filtrar polos D_estinatarios"
 
-#: mail/folder-browser.c:1274
+#: mail/folder-browser.c:1362
 msgid "Filter on _Mailing List"
 msgstr "Filtrar pola Lista de _Correo"
 
-#: mail/folder-browser.c:1285 ui/evolution-mail-message.xml.h:89
+#: mail/folder-browser.c:1373 ui/evolution-mail-message.xml.h:89
 msgid "_Edit as New Message..."
 msgstr "_Editar coma unha Nova Mensaxe"
 
-#: mail/folder-browser.c:1287 ui/evolution-mail-message.xml.h:97
+#: mail/folder-browser.c:1375 ui/evolution-mail-message.xml.h:97
 msgid "_Save As..."
 msgstr "Gardar _Como..."
 
-#: mail/folder-browser.c:1289
+#: mail/folder-browser.c:1377
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: mail/folder-browser.c:1294 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1382 ui/evolution-mail-message.xml.h:96
 msgid "_Reply to Sender"
 msgstr "_Responder � Autor"
 
-#: mail/folder-browser.c:1296 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1384 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _List"
 msgstr "Responder � _Lista"
 
-#: mail/folder-browser.c:1298 ui/evolution-mail-message.xml.h:68
+#: mail/folder-browser.c:1386 ui/evolution-mail-message.xml.h:68
 msgid "Reply to _All"
 msgstr "Responder a _Todos"
 
-#: mail/folder-browser.c:1300
+#: mail/folder-browser.c:1388
 msgid "_Forward"
 msgstr "_Remitir"
 
-#: mail/folder-browser.c:1303 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1391 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "Marcar como _Lida"
 
-#: mail/folder-browser.c:1305 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1393 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Marcar como _Non Lida"
 
-#: mail/folder-browser.c:1307
+#: mail/folder-browser.c:1395
 msgid "Mark as _Important"
 msgstr "Marcar coma _Importante"
 
-#: mail/folder-browser.c:1309
+#: mail/folder-browser.c:1397
 msgid "Mark as Unim_portant"
 msgstr "Marcar coma Non Im_portante"
 
-#: mail/folder-browser.c:1314
+#: mail/folder-browser.c:1402
 msgid "_Move to Folder..."
 msgstr "_Mover � Cartafol.."
 
-#: mail/folder-browser.c:1316
+#: mail/folder-browser.c:1404
 msgid "_Copy to Folder..."
 msgstr "_Copiar a un Cartafol..."
 
-#: mail/folder-browser.c:1320 ui/evolution-mail-message.xml.h:99
+#: mail/folder-browser.c:1408 ui/evolution-mail-message.xml.h:99
 msgid "_Undelete"
 msgstr "_Recuperar"
 
-#: mail/folder-browser.c:1325
+#: mail/folder-browser.c:1413
 msgid "Add Sender to Address Book"
 msgstr "Engadir o Autor ao Libro de Enderezos"
 
-#: mail/folder-browser.c:1330
+#: mail/folder-browser.c:1418
 msgid "Apply Filters"
 msgstr "Aplicar Filtros"
 
-#: mail/folder-browser.c:1334
+#: mail/folder-browser.c:1422
 msgid "Create Ru_le From Message"
 msgstr "Crear Reg_ra Dende Mensaxe"
 
-#: mail/folder-browser.c:1492
+#: mail/folder-browser.c:1573
 msgid "Filter on Mailing List"
 msgstr "Filtrar pola Lista de Correo"
 
-#: mail/folder-browser.c:1493
+#: mail/folder-browser.c:1574
 msgid "VFolder on Mailing List"
 msgstr "CartafolV pola Lista de Correo"
 
-#: mail/folder-browser.c:1495
+#: mail/folder-browser.c:1576
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtrar pola Lista de Correo (%s)"
 
-#: mail/folder-browser.c:1496
+#: mail/folder-browser.c:1577
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "CartafolV pola Lista de Correo (%s)"
@@ -7997,11 +8471,18 @@ msgstr "Editor de Novas de Evolution"
 msgid "Evolution Account Editor"
 msgstr "Editor de Contas de Evolution"
 
-#: mail/mail-account-gui.c:1010
+#: mail/mail-account-gui.c:947
+#, fuzzy
+msgid "Could not save signature file."
+msgstr ""
+"Non foi posible abrir o ficheiro de sinatura %s:\n"
+"%s"
+
+#: mail/mail-account-gui.c:1024
 msgid "Save signature"
 msgstr "Gravar sinatura"
 
-#: mail/mail-account-gui.c:1016
+#: mail/mail-account-gui.c:1030
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -8011,40 +8492,40 @@ msgstr ""
 "\n"
 "�Desexa gardar os cambios?"
 
-#: mail/mail-account-gui.c:1597
+#: mail/mail-account-gui.c:1615
 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:145
+#: mail/mail-accounts.c:144
 msgid " (default)"
 msgstr " (por defecto)"
 
-#: mail/mail-accounts.c:190
+#: mail/mail-accounts.c:189
 msgid "Disable"
 msgstr "Desactivar"
 
-#: mail/mail-accounts.c:192
+#: mail/mail-accounts.c:191
 msgid "Enable"
 msgstr "Activado"
 
-#: mail/mail-accounts.c:279
+#: mail/mail-accounts.c:278
 msgid "Are you sure you want to delete this account?"
 msgstr "�Est� seguro de que quere borrar esta conta?"
 
-#: mail/mail-accounts.c:283
+#: mail/mail-accounts.c:282
 msgid "Don't delete"
 msgstr "Non borrar"
 
-#: mail/mail-accounts.c:286
+#: mail/mail-accounts.c:285
 msgid "Really delete account?"
 msgstr "�Borrar esta conta de verdade?"
 
-#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
+#: mail/mail-accounts.c:511 mail/mail-accounts.c:515
 msgid "Are you sure you want to delete this news account?"
 msgstr "�Est� seguro de que quere borrar esta conta de novas?"
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:758 mail/mail-config.glade.h:42
+#: mail/mail-accounts.c:760 mail/mail-config.glade.h:45
 msgid "Mail Settings"
 msgstr "Configuraci�n de Correo"
 
@@ -8104,7 +8585,19 @@ msgstr ""
 msgid "You have not set a mail transport method"
 msgstr "Non definiu ning�n m�todo de env�o de correo"
 
-#: mail/mail-callbacks.c:218
+#. FIXME: this wording sucks
+#: mail/mail-callbacks.c:216
+msgid ""
+"You are sending an HTML-formatted message, but the following recipients do "
+"not want HTML-formatted mail:\n"
+msgstr ""
+
+#: mail/mail-callbacks.c:231
+#, fuzzy
+msgid "Send anyway?"
+msgstr "Enviar unha mensaxe"
+
+#: mail/mail-callbacks.c:273
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -8112,7 +8605,7 @@ msgstr ""
 "Esta mensaxe non ten asunto.\n"
 "�Enviar realmente?"
 
-#: mail/mail-callbacks.c:262
+#: mail/mail-callbacks.c:317
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -8120,53 +8613,55 @@ 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:266
+#: mail/mail-callbacks.c:321
 msgid "This message contains only Bcc recipients."
 msgstr "Esta mensaxe s� cont�n destinatarios Bcc."
 
-#: mail/mail-callbacks.c:270
+#: mail/mail-callbacks.c:325
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
-"� posible que o servidor de correo revele os destinatarios engadindo unha cabeceira Apparently-To.\n"
+"� posible que o servidor de correo revele os destinatarios engadindo unha "
+"cabeceira Apparently-To.\n"
 "�Enviar de todas maneiras?"
 
-#: mail/mail-callbacks.c:359
+#: mail/mail-callbacks.c:419
+#, fuzzy
+msgid "This message contains invalid recipients:"
+msgstr "Esta mensaxe s� cont�n destinatarios Bcc."
+
+#: mail/mail-callbacks.c:454
 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:424
+#: mail/mail-callbacks.c:550
 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:666
+#: mail/mail-callbacks.c:783
 msgid "an unknown sender"
 msgstr "un remitente desco�ecido"
 
-#: mail/mail-callbacks.c:671
+#: mail/mail-callbacks.c:788
 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:934
-msgid "Forwarded message:\n"
-msgstr "Mensaxe remitida:\n"
-
-#: mail/mail-callbacks.c:1034
+#: mail/mail-callbacks.c:1171
 msgid "Move message(s) to"
 msgstr "Mover mensaxe(s) a"
 
-#: mail/mail-callbacks.c:1036
+#: mail/mail-callbacks.c:1173
 msgid "Copy message(s) to"
 msgstr "Copiar mensaxe(s) a"
 
-#: mail/mail-callbacks.c:1405
+#: mail/mail-callbacks.c:1547
 #, 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:1427
+#: mail/mail-callbacks.c:1569
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -8174,7 +8669,7 @@ msgstr ""
 "S� pode editar mensaxes gardadas\n"
 "no cartafol de Borradores."
 
-#: mail/mail-callbacks.c:1461
+#: mail/mail-callbacks.c:1603
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -8182,28 +8677,28 @@ msgstr ""
 "S� pode reenviar mensaxes\n"
 "do cartafol de Enviadas."
 
-#: mail/mail-callbacks.c:1473
+#: mail/mail-callbacks.c:1615
 #, 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:1494
+#: mail/mail-callbacks.c:1636
 msgid "No Message Selected"
 msgstr "Ningunha Mensaxe Seleccionada"
 
-#: mail/mail-callbacks.c:1579
+#: mail/mail-callbacks.c:1721
 msgid "Save Message As..."
 msgstr "Gardar Mensaxe Como..."
 
-#: mail/mail-callbacks.c:1581
+#: mail/mail-callbacks.c:1723
 msgid "Save Messages As..."
 msgstr "Gardar Mensaxes Como..."
 
-#: mail/mail-callbacks.c:1726 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:1868 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Advertencia"
 
-#: mail/mail-callbacks.c:1731
+#: mail/mail-callbacks.c:1873
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8215,11 +8710,11 @@ msgstr ""
 "\n"
 "�Eliminar realmente estas mensaxes?"
 
-#: mail/mail-callbacks.c:1738
+#: mail/mail-callbacks.c:1880
 msgid "Do not ask me again."
 msgstr "Non preguntar de novo"
 
-#: mail/mail-callbacks.c:1843
+#: mail/mail-callbacks.c:1985
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -8228,19 +8723,19 @@ msgstr ""
 "Erro ao cargar a informaci�n do filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1853
+#: mail/mail-callbacks.c:1995
 msgid "Filters"
 msgstr "Filtros"
 
-#: mail/mail-callbacks.c:1899
+#: mail/mail-callbacks.c:2041
 msgid "Print Message"
 msgstr "Imprimir Mensaxe"
 
-#: mail/mail-callbacks.c:1945
+#: mail/mail-callbacks.c:2087
 msgid "Printing of message failed"
 msgstr "A impresi�n da mensaxe fallou"
 
-#: mail/mail-callbacks.c:2029
+#: mail/mail-callbacks.c:2171
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -8252,7 +8747,8 @@ msgid ""
 "below do not need to be filled in,\n"
 "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"
+"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:137
@@ -8261,7 +8757,8 @@ msgid ""
 "not sure, ask your system\n"
 "administrator or Internet Service Provider."
 msgstr ""
-"Por favor, introduza informacion sobre o seu servidor de correo entrante. Se non est� seguro, pregunte\n"
+"Por favor, introduza informacion sobre o seu servidor de correo entrante. Se "
+"non est� seguro, pregunte\n"
 "ao seu administrador de sistemas ou fornecedor de acceso a Internet."
 
 #: mail/mail-config-druid.c:139
@@ -8274,7 +8771,8 @@ msgid ""
 "sure, ask your system\n"
 "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"
+"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:143
@@ -8287,9 +8785,12 @@ msgid ""
 "space below.\n"
 "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"
-"de transporte de correo sa�nte que proporcionou hanse agrupar para crear unha conta\n"
-"de correo de Evolution. Introduza un nome para esta conta no espacio de embaixo.\n"
+"Case rematou co proceso de configuraci�n do correo. A identidade, servidor "
+"de correo entrente e m�todo\n"
+"de transporte de correo sa�nte que proporcionou hanse agrupar para crear "
+"unha conta\n"
+"de correo de Evolution. Introduza un nome para esta conta no espacio de "
+"embaixo.\n"
 "Este nome s� se emprega para amosalo."
 
 #. set window title
@@ -8297,81 +8798,107 @@ msgstr ""
 msgid "Evolution Account Assistant"
 msgstr "Asistente de Contas de Evolution"
 
-#. right now, the URL always works basically as a matter of luck...
-#. * both IMAP and mbox spool stores have INBOX as their inbox folder
-#. * name. I don't think this will work with maildir. How can we figure out
-#. * what shortcut to insert?
+#: mail/mail-config.c:315
+#, fuzzy, c-format
+msgid "Account %d"
+msgstr "Conta"
+
+#: mail/mail-config.c:1618
+#, c-format
+msgid ""
+"Could not get inbox for new mail store:\n"
+"%s\n"
+"No shortcut will be created."
+msgstr ""
+
+#. Create the shortcut. FIXME: This only works if the
+#. * full name matches the path.
 #.
-#: mail/mail-config.c:1585
+#: mail/mail-config.c:1629
 #, c-format
 msgid "%s: Inbox"
 msgstr "%s: Inbox"
 
-#: mail/mail-config.c:1819
+#: mail/mail-config.c:1873
 msgid "Checking Service"
 msgstr "Comprobando Servicio"
 
-#: mail/mail-config.c:1890 mail/mail-config.c:1893
+#: mail/mail-config.c:1944 mail/mail-config.c:1947
 msgid "Connecting to server..."
 msgstr "Conectando ao servidor..."
 
 #: mail/mail-config.glade.h:1
+#, fuzzy
+msgid " _Check for supported types "
+msgstr "Dete_ctar tipos soportados "
+
+#: mail/mail-config.glade.h:2
 msgid " color"
 msgstr " cor"
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL non est� soportado nesta versi�n de evolution)"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr "Conta"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr "Informaci�n de Contas"
 
-#: mail/mail-config.glade.h:5 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:6 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Xesti�n de Contas"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "Accounts"
 msgstr "Contas"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr "Sempre cifrarme a min mesmo cando se env�e correo cifrado"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr "Sempre cifrarme a min mesmo cando se env�e correo cifrado"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:10
 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:10 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Anexo"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:12
 msgid "Authentication"
 msgstr "Autenticaci�n"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:13
 msgid "Authentication Type: "
 msgstr "Tipo de Autenticaci�n: "
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:14
 msgid "Certificate ID:"
 msgstr "ID do certificado:"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:16
 msgid "Composer"
 msgstr "Compo�edor"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:17
+#, fuzzy
+msgid "Configuration"
+msgstr "Configuraci�n do Correo"
+
+#: mail/mail-config.glade.h:18
+#, fuzzy
+msgid "Confirm when Expunging a folder"
+msgstr "Limpando o cartafol"
+
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -8387,237 +8914,225 @@ msgstr ""
 "\n"
 "Prema \"Finalizar\" para gardar a nova configuraci�n."
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr "Por de_fecto"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:26
 msgid "Default Forward style is: "
 msgstr "O estilo de Remitir por defecto �: "
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:27
 msgid "Default character encoding: "
 msgstr "Codificaci�n de caracteres por defecto: "
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:29
 msgid "Digital IDs..."
 msgstr "IDs dixitais..."
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:30
 msgid "Display"
 msgstr "Amosar"
 
-#: mail/mail-config.glade.h:27 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:31 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Feito"
 
-#: mail/mail-config.glade.h:28 shell/e-local-storage.c:174
+#: mail/mail-config.glade.h:32 shell/e-local-storage.c:174
 msgid "Drafts"
 msgstr "Borradores"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:33
 msgid "Drafts folder:"
 msgstr "Cartafol de borradores:"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:34
 msgid "E_nable"
 msgstr "A_ctivar"
 
-#: mail/mail-config.glade.h:31
-msgid "Each account must have a different name."
-msgstr "Cada conta ten que ter un nome diferente."
-
-#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:96
 #: widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr "Editar..."
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:36
 msgid "Enabled"
 msgstr "Activado"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:37
 msgid "Get Digital ID..."
 msgstr "Obter ID Dixital..."
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:38
 msgid "HTML signature file:"
 msgstr "Ficheiro de sinatura HTML:"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:39
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:40 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Identidade"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:41
 msgid "In HTML mail"
 msgstr "En correo HTML"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:42
 msgid "Inline"
 msgstr "Inline"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:43
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:44
 msgid "Mail Configuration"
 msgstr "Configuraci�n do Correo"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:46
 msgid "Mailbox location"
 msgstr "Localizaci�n da caixa do correo"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:47
 msgid "Make this my _default account"
 msgstr "Facer esta a mi�a conta por _defecto"
 
-#: mail/mail-config.glade.h:45
-msgid "Message _preview should be displayed by default"
-msgstr "Debe amosarse a _previsualizaci�n da mensaxe por defecto"
-
-#: mail/mail-config.glade.h:46
-msgid "Message list should display in a _threaded fashion by default"
-msgstr "A lista de mensaxes debe amosarse en modo _f�o por defecto"
-
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 msgid "NNTP Server:"
 msgstr "Servidor NNTP:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:49
 msgid "News"
 msgstr "Novas"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:51
 msgid "Optional Information"
 msgstr "Informaci�n Opcional"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:53
 msgid "PGP Key ID:"
 msgstr "ID da Clave PGP:"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 msgid "Pick a color"
 msgstr "Escoller unha cor"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 msgid "Pretty Good Privacy"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 msgid "Prompt when sending messages with an _empty subject"
 msgstr "Avisar cando se env�en mensaxes cun asunto baleiro"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 msgid "Prompt 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:59
+#: mail/mail-config.glade.h:60
 msgid "Qmail maildir "
 msgstr "Maildir de Qmail "
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:61
 msgid "Quoted"
 msgstr "Citado"
 
-#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Recepci�n de Correo"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:63
 msgid "Receiving Mail"
 msgstr "Recepci�n de Correo"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:64
 msgid "Receiving Options"
 msgstr "Opci�ns de Recepci�n"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:65
 msgid "Required Information"
 msgstr "Informaci�n Requirida"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:67
 msgid "Secure MIME"
 msgstr "MIME Seguro"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:68
 msgid "Security"
 msgstr "Seguridade"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:69
 msgid "Select Filter Log file..."
 msgstr "Seleccionar un ficheiro de rexistro para o filtro..."
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:70
 msgid "Select PGP binary"
 msgstr "Seleccionar un binario PGP"
 
-#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:71 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Enviando Correo"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:72
 msgid "Sending Mail"
 msgstr "Enviando Correo"
 
-#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:74 mail/message-list.etspec.h:6
 #: shell/e-local-storage.c:177
 msgid "Sent"
 msgstr "Enviada"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:75
 msgid "Sent and Draft Messages"
 msgstr "Mensaxes Enviadas e Borradores"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:76
 msgid "Sent messages folder:"
 msgstr "Cartafol de mensaxes enviadas:"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:77
 msgid "Server Configuration"
 msgstr "Configuraci�n do Servidor"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 msgid "Server Type: "
 msgstr "Tipo de Servidor: "
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 msgid "Server requires _authentication"
 msgstr "O servidor require _autenticaci�n"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:80
 msgid "Signature file:"
 msgstr "Ficheiro de sinatura:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "Source"
 msgstr "Fonte"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 msgid "Source Information"
 msgstr "Informaci�n da Fonte"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:83
 msgid "Sources"
 msgstr "Fontes"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
 msgid "Special Folders"
 msgstr "Cartafoles Especiais"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:85
 msgid "Standard Unix mbox"
 msgstr "mbox est�ndar de Unix"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:87
 msgid "Use secure connection (_SSL)"
 msgstr "Usar conexi�n segura (_SSL)"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:88
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -8627,78 +9142,74 @@ msgstr ""
 "\n"
 "Prema en \"Seguinte\" para comezar. "
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:92
 msgid "_Always load images off the net"
 msgstr "Cargar _sempre as mensaxes da rede"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:93
 msgid "_Automatically check for new mail every"
 msgstr "Comprobar _automaticamente se hai correo novo cada"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:94
 msgid "_Check for supported types"
 msgstr "Dete_ctar tipos soportados "
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:97
 msgid "_Email Address:"
 msgstr "_Enderezo de Correo:"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:98
 msgid "_Empty trash folders on exit"
 msgstr "_Baleirar os cartafoles de lixo ao sair"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 msgid "_Full Name:"
 msgstr "_Nome Completo:"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "_HTML Signature:"
 msgstr "Sinatura _HTML:"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 msgid "_Highlight citations with"
 msgstr "_Resaltar as citas con "
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:102
 msgid "_Host:"
 msgstr "_Servidor:"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 msgid "_Load images if sender is in addressbook"
 msgstr "_Cargar imaxes se o autor est� no libro de enderezos"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 msgid "_Log filter actions to:"
 msgstr "_Rexistrar as acci�ns do filtro a:"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 msgid "_Mark messages as Read after"
 msgstr "_Marcar mensaxes como Lidas despois de"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 msgid "_Never load images off the net"
 msgstr "_Nunca cargar as imaxes da rede"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 msgid "_Organization:"
 msgstr "_Organizaci�n:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:109
 msgid "_PGP binary path:"
 msgstr "Ruta do binario _PGP:"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 msgid "_Path:"
 msgstr "_Ruta:"
 
-#: mail/mail-config.glade.h:110
-msgid "_Remember PGP Passphrase until exit"
-msgstr "_Lembrar o contrasinal PGP ata sa�r"
-
 #: mail/mail-config.glade.h:111
 msgid "_Remember this password"
 msgstr "_Lembrar este contrasinal"
@@ -8731,39 +9242,39 @@ msgstr "[gardasitio]"
 msgid "seconds."
 msgstr "segundos."
 
-#: mail/mail-crypto.c:60
+#: mail/mail-crypto.c:59
 msgid "Could not create a PGP signature context."
 msgstr "Non foi posible crear un contexto de sinatura PGP."
 
-#: mail/mail-crypto.c:86
+#: mail/mail-crypto.c:84
 msgid "Could not create a PGP verification context."
 msgstr "Non foi posible crear un contexto de verificaci�n PGP."
 
-#: mail/mail-crypto.c:116
+#: mail/mail-crypto.c:113
 msgid "Could not create a PGP encryption context."
 msgstr "Non foi posible crear un contexto de cifrado PGP."
 
-#: mail/mail-crypto.c:142
+#: mail/mail-crypto.c:138
 msgid "Could not create a PGP decryption context."
 msgstr "Non foi posible crear un contexto de descifrado PGP."
 
-#: mail/mail-crypto.c:177
+#: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
 msgstr "Non foi posible crear un contexto de sinatura S/MIME."
 
-#: mail/mail-crypto.c:209
+#: mail/mail-crypto.c:205
 msgid "Could not create a S/MIME certsonly context."
 msgstr "Non foi posible crear un contexto de s� certificaci�n S/MIME."
 
-#: mail/mail-crypto.c:240
+#: mail/mail-crypto.c:236
 msgid "Could not create a S/MIME encryption context."
 msgstr "Non foi posible crear un contexto de cifrado S/MIME."
 
-#: mail/mail-crypto.c:271
+#: mail/mail-crypto.c:267
 msgid "Could not create a S/MIME envelope context."
 msgstr "Non foi posible crear un contexto de sobre S/MIME."
 
-#: mail/mail-crypto.c:301
+#: mail/mail-crypto.c:297
 msgid "Could not create a S/MIME decode context."
 msgstr "Non foi posible crear un contexto de descodificaci�n S/MIME."
 
@@ -8771,195 +9282,177 @@ msgstr "Non foi posible crear un contexto de descodificaci�n S/MIME."
 msgid "Save Attachment"
 msgstr "Gardar Anexo"
 
-#: mail/mail-display.c:332
+#: mail/mail-display.c:327
 msgid "Save to Disk..."
 msgstr "Gardar � Disco..."
 
-#: mail/mail-display.c:334
+#: mail/mail-display.c:329
 msgid "View Inline"
 msgstr "Ver Inline"
 
-#: mail/mail-display.c:336
+#: mail/mail-display.c:331
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s..."
 
-#: mail/mail-display.c:397
+#: mail/mail-display.c:392
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Ver Inline (mediante %s)"
 
-#: mail/mail-display.c:401
+#: mail/mail-display.c:396
 msgid "Hide"
 msgstr "Agochar"
 
-#: mail/mail-display.c:422
+#: mail/mail-display.c:417
 msgid "External Viewer"
 msgstr "Visualizador Externo"
 
-#: mail/mail-display.c:1049
+#: mail/mail-display.c:1053
 msgid "Loading message content"
 msgstr "Cargado o contido da mensaxe"
 
-#: mail/mail-display.c:1405
+#: mail/mail-display.c:1515
 msgid "Open Link in Browser"
 msgstr "Abrir Ligaz�n no Navegador"
 
-#: mail/mail-display.c:1407
+#: mail/mail-display.c:1517
 msgid "Copy Link Location"
 msgstr "Copiar Localizaci�n da Ligaz�n"
 
-#: mail/mail-display.c:1409
+#: mail/mail-display.c:1520
 msgid "Save Link as (FIXME)"
 msgstr "Gardar Ligaz�n coma (AM��AME)"
 
-#: mail/mail-display.c:1411
+#: mail/mail-display.c:1523
 msgid "Save Image as..."
 msgstr "Gardar Imaxe coma..."
 
-#: mail/mail-folder-cache.c:151
-#, c-format
-msgid "%d new"
-msgstr "%d nova(s)"
-
-#: mail/mail-folder-cache.c:157 mail/mail-folder-cache.c:164
-#: mail/mail-folder-cache.c:171
-msgid ", "
-msgstr ", "
-
-#: mail/mail-folder-cache.c:158
-#, c-format
-msgid "%d hidden"
-msgstr "%d oculta(s)"
-
-#: mail/mail-folder-cache.c:165
-#, c-format
-msgid "%d selected"
-msgstr "%d seleccionada(s)"
-
-#: mail/mail-folder-cache.c:174
-#, c-format
-msgid "%d unsent"
-msgstr "%d sen enviar"
-
-#: mail/mail-folder-cache.c:176
-#, c-format
-msgid "%d total"
-msgstr "%d total"
-
-#: mail/mail-format.c:623
+#: mail/mail-format.c:627
 #, c-format
 msgid "%s attachment"
 msgstr "%s anexo"
 
-#: mail/mail-format.c:676
+#: mail/mail-format.c:680
 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/mail-format.c:764
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:856
+#: mail/mail-format.c:862
 msgid "Bad Address"
 msgstr "Enderezo Incorrecto"
 
-#: mail/mail-format.c:878 mail/message-list.etspec.h:3
+#: mail/mail-format.c:903 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "De"
 
-#: mail/mail-format.c:881
+#: mail/mail-format.c:906
 msgid "Reply-To"
 msgstr "Responder-A"
 
-#: mail/mail-format.c:884 mail/message-list.etspec.h:10
+#: mail/mail-format.c:910 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Para"
 
-#: mail/mail-format.c:887
+#: mail/mail-format.c:914
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:1306
+#: mail/mail-format.c:1357
 msgid "No GPG/PGP program configured."
 msgstr "O programa GPG/PGP non est� configurado."
 
-#: mail/mail-format.c:1322
+#: mail/mail-format.c:1373
 msgid "Encrypted message not displayed"
 msgstr "Non se amosa a mensaxe cifrada"
 
-#: mail/mail-format.c:1333
+#: mail/mail-format.c:1384
 msgid "Encrypted message"
 msgstr "Mensaxe cifrada"
 
-#: mail/mail-format.c:1334
+#: mail/mail-format.c:1385
 msgid "Click icon to decrypt."
 msgstr "Prema na icona para descifrar."
 
-#: mail/mail-format.c:1392
+#: mail/mail-format.c:1440
 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:1403
+#: mail/mail-format.c:1451
 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:2061
+#: mail/mail-format.c:2128
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Punteiro a sitio FTP (%s)"
 
-#: mail/mail-format.c:2075
+#: mail/mail-format.c:2142
 #, 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:2080
+#: mail/mail-format.c:2147
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Punteiro a ficheiro local (%s)"
 
-#: mail/mail-format.c:2109
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Punteiro a datos remotos (%s)"
 
-#: mail/mail-format.c:2117
+#: mail/mail-format.c:2184
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Punteiro a datos externos desco�ecidos (tipo \"%s\")"
 
-#: mail/mail-format.c:2122
+#: mail/mail-format.c:2189
 msgid "Malformed external-body part."
 msgstr "Parte external-body mal formada."
 
-#: mail/mail-local.c:330
-#, c-format
-msgid "No such folder /%s"
-msgstr "Non existe o cartafol /%s"
+#: mail/mail-local.c:563
+#, fuzzy
+msgid "Reconfiguring folder"
+msgstr "Refrescando o cartafol"
 
-#: mail/mail-local.c:460
-#, c-format
-msgid "Registering '%s'"
-msgstr "Rexistrando '%s'"
+#: mail/mail-local.c:636
+#, fuzzy, c-format
+msgid ""
+"Cannot save folder metainfo; you'll probably 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:689
+#, 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:747
+#: mail/mail-local.c:735
+#, fuzzy, c-format
+msgid "Cannot delete folder metadata %s: %s"
+msgstr ""
+"Non foi posible borrar o cartafol:\n"
+"%s"
+
+#: mail/mail-local.c:1075
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Cambiando o cartafol \"%s\" � formato \"%s\""
 
-#: mail/mail-local.c:868
+#: mail/mail-local.c:1090
 #, c-format
-msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
-"open this folder anymore: %s"
+msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
-"Non foi posible garda-la metainformaci�n do cartafol, seguramente\n"
-"non poder� abrir este cartafol outra vez: %s"
 
-#: mail/mail-local.c:908
+#: mail/mail-local.c:1112
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -8967,16 +9460,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:1001
+#: mail/mail-local.c:1200
 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:1012
-#, c-format
-msgid "Reconfigure %s"
+#: mail/mail-local.c:1209
+#, fuzzy, c-format
+msgid "Reconfigure /%s"
 msgstr "Reconfigurar %s"
 
-#: mail/mail-mt.c:187
+#: mail/mail-mt.c:199
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -8985,7 +9478,7 @@ msgstr ""
 "Erro durante '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:190
+#: mail/mail-mt.c:202
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -8995,126 +9488,139 @@ msgstr ""
 "%s"
 
 #. Remember the password?
-#: mail/mail-mt.c:439
+#: mail/mail-mt.c:509
 msgid "Remember this password"
 msgstr "Lembrar este contrasinal"
 
-#: mail/mail-mt.c:796
+#: mail/mail-mt.c:510
+msgid "Remember this password for the remainder of this session"
+msgstr ""
+
+#: mail/mail-mt.c:567
+#, fuzzy, c-format
+msgid "Enter Password for %s"
+msgstr "Introduza o seu contrasinal para %s"
+
+#: mail/mail-mt.c:570
+#, fuzzy
+msgid "Enter Password"
+msgstr "Contrasinal"
+
+#: mail/mail-mt.c:886
 msgid "Working"
 msgstr "Traballando"
 
-#: mail/mail-ops.c:84
+#: mail/mail-ops.c:86
 msgid "Filtering Folder"
 msgstr "Filtrando o Cartafol"
 
-#: mail/mail-ops.c:227
+#: mail/mail-ops.c:229
 msgid "Fetching Mail"
 msgstr "Recibindo Correo"
 
-#: mail/mail-ops.c:591
+#: mail/mail-ops.c:482 mail/mail-ops.c:512
+msgid "However, the message was successfully sent."
+msgstr ""
+
+#: mail/mail-ops.c:549
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Enviando \"%s\""
 
-#: mail/mail-ops.c:710
+#: mail/mail-ops.c:668
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando a mensaxe %d de %d"
 
-#: mail/mail-ops.c:729
+#: mail/mail-ops.c:687
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Fallou na mensaxe %d de %d"
 
-#: mail/mail-ops.c:731 mail/mail-send-recv.c:500
+#: mail/mail-ops.c:689 mail/mail-send-recv.c:522
 msgid "Complete."
 msgstr "Completado."
 
-#: mail/mail-ops.c:824
+#: mail/mail-ops.c:782
 msgid "Saving message to folder"
 msgstr "Gardando a mensaxe no cartafol"
 
-#: mail/mail-ops.c:903
+#: mail/mail-ops.c:861
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Movendo mensaxes a %s"
 
-#: mail/mail-ops.c:903
+#: mail/mail-ops.c:861
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando as mensaxes a %s"
 
-#: mail/mail-ops.c:920
+#: mail/mail-ops.c:878
 msgid "Moving"
 msgstr "Movendo"
 
-#: mail/mail-ops.c:923
+#: mail/mail-ops.c:881
 msgid "Copying"
 msgstr "Copiando"
 
-#: mail/mail-ops.c:1035
+#: mail/mail-ops.c:993
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Examinando os cartafoles en \"%s\""
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1075 mail/mail-ops.c:1076 shell/e-local-storage.c:179
+#: mail/mail-ops.c:1040 shell/e-local-storage.c:179
 msgid "Trash"
 msgstr "Lixo"
 
-#: mail/mail-ops.c:1212
+#: mail/mail-ops.c:1173
 msgid "Forwarded messages"
 msgstr "Mensaxes remitidas"
 
-#: mail/mail-ops.c:1254
+#: mail/mail-ops.c:1215
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abrindo cartafol %s"
 
-#: mail/mail-ops.c:1323
+#: mail/mail-ops.c:1284
 #, c-format
 msgid "Opening store %s"
 msgstr "Abrindo armacenamento %s"
 
-#: mail/mail-ops.c:1396
-#, c-format
-msgid "Creating folder %s"
-msgstr "Creando o cartafol %s"
-
-#: mail/mail-ops.c:1466
+#: mail/mail-ops.c:1353
 #, c-format
 msgid "Removing folder %s"
 msgstr "Eliminando o cartafol %s"
 
-#: mail/mail-ops.c:1562
-#, c-format
-msgid "Synchronizing '%s'"
-msgstr "Sincronizando '%s'"
+#: mail/mail-ops.c:1445
+#, fuzzy, c-format
+msgid "Storing folder '%s'"
+msgstr "Creando o cartafol %s"
 
-#: mail/mail-ops.c:1613
+#: mail/mail-ops.c:1496
 msgid "Refreshing folder"
 msgstr "Refrescando o cartafol"
 
-#: mail/mail-ops.c:1649
+#: mail/mail-ops.c:1532
 msgid "Expunging folder"
 msgstr "Limpando o cartafol"
 
-#: mail/mail-ops.c:1698
+#: mail/mail-ops.c:1581
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Recibindo a mensaxe %s"
 
-#: mail/mail-ops.c:1765
+#: mail/mail-ops.c:1648
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Recibindo %d mensaxe(s)"
 
-#: mail/mail-ops.c:1851
+#: mail/mail-ops.c:1734
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Gardando %d mensaxe(s)"
 
-#: mail/mail-ops.c:1931
+#: mail/mail-ops.c:1846
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -9123,7 +9629,7 @@ msgstr ""
 "Non foi posible crear o ficheiro de sa�da: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1957
+#: mail/mail-ops.c:1874
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -9132,11 +9638,11 @@ msgstr ""
 "Erro ao gardar as mensaxes en: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2031
+#: mail/mail-ops.c:1948
 msgid "Saving attachment"
 msgstr "Gardando anexo"
 
-#: mail/mail-ops.c:2047
+#: mail/mail-ops.c:1964
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -9145,16 +9651,21 @@ msgstr ""
 "Non � posible crear ficheiro de sa�da: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2078
+#: mail/mail-ops.c:1995
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Non foi posible escribir os datos: %s"
 
-#: mail/mail-ops.c:2147
+#: mail/mail-ops.c:2064
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectando de %s"
 
+#: mail/mail-ops.c:2065
+#, fuzzy, c-format
+msgid "Reconnecting to %s"
+msgstr "Desconectando de %s"
+
 #: mail/mail-search-dialogue.c:113
 msgid "_Search"
 msgstr "_Buscar"
@@ -9191,53 +9702,93 @@ msgstr "Buscar:"
 msgid "Matches:"
 msgstr "Aparici�ns:"
 
-#: mail/mail-send-recv.c:138
+#: mail/mail-send-recv.c:139
 msgid "Cancelling..."
 msgstr "Cancelando..."
 
-#: mail/mail-send-recv.c:258
-msgid "Send & Receive mail"
+#: mail/mail-send-recv.c:243
+#, fuzzy, c-format
+msgid "Server: %s, Type: %s"
+msgstr "Tipo de Servidor: "
+
+#: mail/mail-send-recv.c:245
+#, c-format
+msgid "Path: %s, Type: %s"
+msgstr ""
+
+#: mail/mail-send-recv.c:247
+#, fuzzy, c-format
+msgid "Type: %s"
+msgstr "Tipo:"
+
+#: mail/mail-send-recv.c:283
+#, fuzzy
+msgid "Send & Receive Mail"
 msgstr "Enviar e Recibir correo"
 
-#: mail/mail-send-recv.c:312
+#: mail/mail-send-recv.c:284
+#, fuzzy
+msgid "Cancel All"
+msgstr "Cancelar"
+
+#: mail/mail-send-recv.c:333
 msgid "Updating..."
 msgstr "Actualizando..."
 
-#: mail/mail-send-recv.c:313 mail/mail-send-recv.c:366
+#: mail/mail-send-recv.c:334 mail/mail-send-recv.c:387
 msgid "Waiting..."
 msgstr "Agardando..."
 
-#: mail/mail-send-recv.c:496
+#: mail/mail-send-recv.c:518
 msgid "Cancelled."
 msgstr "Cancelado."
 
-#: mail/mail-session.c:182
+#: mail/mail-session.c:183
 msgid "User canceled operation."
 msgstr "O usuario cancelou a operaci�n."
 
-#: mail/mail-tools.c:173
+#: mail/mail-tools.c:133
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Non foi posible crear a caixa de correo temporal `%s': %s"
 
-#: mail/mail-tools.c:290
+#: mail/mail-tools.c:259
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Mensaxe remitida - %s"
 
-#: mail/mail-tools.c:294
+#: mail/mail-tools.c:263
 msgid "Forwarded message"
 msgstr "Mensaxe remitida"
 
-#: mail/mail-tools.c:530
+#: mail/mail-tools.c:396
 msgid "Forwarded Message"
 msgstr "Mensaxe Remitida"
 
-#: mail/mail-vfolder.c:280
+#: mail/mail-vfolder.c:84
+#, fuzzy, c-format
+msgid "Setting up vfolder: %s"
+msgstr "Creando o cartafol %s"
+
+#: mail/mail-vfolder.c:201
+#, fuzzy, c-format
+msgid "Updating vfolders for uri: %s"
+msgstr "Examinando os cartafoles en \"%s\""
+
+#: mail/mail-vfolder.c:414
+#, c-format
+msgid ""
+"The following vFolder(s):\n"
+"%sUsed the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+
+#: mail/mail-vfolder.c:636
 msgid "VFolders"
 msgstr "CartafolesV"
 
-#: mail/mail-vfolder.c:500
+#: mail/mail-vfolder.c:742
 msgid "New VFolder"
 msgstr "Novo CartafolV"
 
@@ -9306,7 +9857,7 @@ msgstr "O %A �s %k:%M"
 msgid "%b %d %Y"
 msgstr "%d de %B de %Y"
 
-#: mail/message-list.c:2316
+#: mail/message-list.c:2334
 msgid "Generating message list"
 msgstr "Xerando a lista de mensaxes"
 
@@ -9322,36 +9873,36 @@ msgstr "Recibido"
 msgid "Size"
 msgstr "Tama�o"
 
-#: mail/subscribe-dialog.c:174
+#: mail/subscribe-dialog.c:219
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Examinando os cartafoles baixo %s en \"%s\""
 
-#: mail/subscribe-dialog.c:176
+#: mail/subscribe-dialog.c:221
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Examinando os cartafoles de nivel ra�z en \"%s\""
 
-#: mail/subscribe-dialog.c:275
+#: mail/subscribe-dialog.c:320
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Subscrib�ndose ao cartafol \"%s\""
 
-#: mail/subscribe-dialog.c:277
+#: mail/subscribe-dialog.c:322
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Desubscrib�ndose do cartafol \"%s\""
 
-#: mail/subscribe-dialog.c:1248 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1280 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Cartafol"
 
-#: mail/subscribe-dialog.c:1490
+#: mail/subscribe-dialog.c:1521
 msgid "No server has been selected"
 msgstr "Non se seleccionou ning�n servidor"
 
-#: mail/subscribe-dialog.c:1547
+#: mail/subscribe-dialog.c:1582
 msgid "Please select a server."
 msgstr "Seleccione un servidor."
 
@@ -9391,35 +9942,33 @@ msgstr "_Desubscribir"
 msgid "Evolution component for the executive summary."
 msgstr "Compo�ente de Evolution para o resumo executivo"
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr "F�brica para o compo�ente de Resume Executivo de Evolution."
-
-#: my-evolution/component-factory.c:30
+#: my-evolution/component-factory.c:45
 msgid "Folder containing the Evolution Summary"
 msgstr "Cartafol que cont�n o Resumo de Evolution"
 
-#: my-evolution/component-factory.c:141
+#: my-evolution/component-factory.c:154
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr "Non se pode inicializar o compo�ente de Resumo Executivo de Evolution."
 
-#: my-evolution/e-summary-calendar.c:182 my-evolution/e-summary-calendar.c:200
+#: my-evolution/e-summary-calendar.c:263 my-evolution/e-summary-calendar.c:281
 msgid "Appointments"
 msgstr "Citas"
 
-#: my-evolution/e-summary-calendar.c:183
+#: my-evolution/e-summary-calendar.c:264
 msgid "No appointments"
 msgstr "Non hai citas"
 
-#: my-evolution/e-summary-calendar.c:236
-msgid "%l:%M%p"
-msgstr "%l:%M%p"
+#: my-evolution/e-summary-calendar.c:301
+#, fuzzy
+msgid "%k%M %d %B"
+msgstr "%A, %d de %B"
 
-#: my-evolution/e-summary-calendar.c:238
-msgid "%a %l:%M%p"
-msgstr "%a %k:%M"
+#: my-evolution/e-summary-calendar.c:303
+#, fuzzy
+msgid "%l:%M %d %B"
+msgstr "%A, %d de %B"
 
-#: my-evolution/e-summary-mail.c:113
+#: my-evolution/e-summary-mail.c:130
 msgid "Mail summary"
 msgstr "Resumo de correo"
 
@@ -9427,80 +9976,83 @@ msgstr "Resumo de correo"
 #. see in My Evolution by default. You can find the list of all
 #. stations and their codes in Evolution sources
 #. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-preferences.c:65
-#: my-evolution/e-summary-weather.c:603
+#: my-evolution/e-summary-preferences.c:80
+#: my-evolution/e-summary-weather.c:630
 msgid "KBOS:ZSAM:EGAA"
 msgstr "LEVX:LECO:LEST"
 
-#: my-evolution/e-summary-preferences.c:427
+#: my-evolution/e-summary-preferences.c:441
 msgid "Dictionary.com Word of the Day"
 msgstr "Palabra do D�a de Dictionary.com"
 
-#: my-evolution/e-summary-preferences.c:448
+#: my-evolution/e-summary-preferences.c:463
 msgid "Quotes of the Day"
 msgstr "Citas do D�a"
 
-#: my-evolution/e-summary-preferences.c:875
+#: my-evolution/e-summary-preferences.c:929
 msgid "Add a news feed"
 msgstr "Engadir fonte de novas"
 
-#: my-evolution/e-summary-preferences.c:883
+#: my-evolution/e-summary-preferences.c:937
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Introduza o URL da fonte de novas que desexe engadir"
 
-#: my-evolution/e-summary-preferences.c:887
+#: my-evolution/e-summary-preferences.c:941
 msgid "Name:"
 msgstr "Nome:"
 
-#: my-evolution/e-summary-preferences.c:1419
+#: my-evolution/e-summary-preferences.c:1486
 msgid "Summary Settings"
 msgstr "Preferencias do Resumo"
 
-#: my-evolution/e-summary-rdf.c:281
-msgid "There was an error downloading news feed"
-msgstr "Houbo un erro ao descarga-la fonte de novas"
-
-#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
-msgid "<b>Error downloading RDF</b>"
+#: my-evolution/e-summary-rdf.c:297 my-evolution/e-summary-rdf.c:382
+#: my-evolution/e-summary-rdf.c:415
+#, fuzzy
+msgid "Error downloading RDF"
 msgstr "<b>Erro descargando o RDF</b>"
 
-#: my-evolution/e-summary-rdf.c:479
+#: my-evolution/e-summary-rdf.c:507
 msgid "News Feed"
 msgstr "Fonte de Novas"
 
-#: my-evolution/e-summary-tasks.c:213
+#: my-evolution/e-summary-tasks.c:238
 msgid "No tasks"
 msgstr "Non hai tarefas"
 
-#: my-evolution/e-summary-weather.c:57
+#: my-evolution/e-summary-tasks.c:277
+#, fuzzy
+msgid "(No Description)"
+msgstr "Descrici�n:"
+
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr "O Meu Tempo"
 
-#: my-evolution/e-summary-weather.c:324
+#: my-evolution/e-summary-weather.c:349
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr "<dd><b>Non se puido contactar co servidor de tempo</b></dd>"
 
-#: my-evolution/e-summary-weather.c:512
+#: my-evolution/e-summary-weather.c:539
 msgid "Weather"
 msgstr "Tempo"
 
-#: my-evolution/e-summary-weather.c:664
+#: my-evolution/e-summary-weather.c:691
 msgid "Regions"
 msgstr "Rexi�ns"
 
-#: my-evolution/e-summary.c:145
+#: my-evolution/e-summary.c:187
 msgid "%A, %B %e %Y"
 msgstr "%A, %e de %B de %Y"
 
-#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:568 ui/my-evolution.xml.h:3
 msgid "Print Summary"
 msgstr "Imprimir Resumo"
 
-#: my-evolution/e-summary.c:518
+#: my-evolution/e-summary.c:614
 msgid "Printing of Summary failed"
 msgstr "A impresi�n do Resumo fallou"
 
-#: my-evolution/main.c:52
+#: my-evolution/main.c:67
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "O compo�ente Resumo Executivo non puido inicializar Bonobo.\n"
 
@@ -10727,69 +11279,71 @@ msgid "One w_eek"
 msgstr "Unha sema_na"
 
 #: my-evolution/my-evolution.glade.h:12
-msgid "Refresh _time (seconds):"
+#, fuzzy
+msgid "R_efresh time (seconds):"
 msgstr "_Tempo de refresco (segundos):"
 
 #: my-evolution/my-evolution.glade.h:13
+msgid "Refresh _time (seconds):"
+msgstr "_Tempo de refresco (segundos):"
+
+#: my-evolution/my-evolution.glade.h:14
+#, fuzzy
+msgid "S_how full path for folders"
+msgstr "Amo_sa-las rutas completas dos cartafoles"
+
+#: my-evolution/my-evolution.glade.h:15
 msgid "Show _all tasks"
 msgstr "_Amosar t�dalas tarefas"
 
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:16
 msgid "Show _today's tasks"
 msgstr "Amosa-las _tarefas de hoxe"
 
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:17
 msgid "Tasks "
 msgstr "Tarefas "
 
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:18
 msgid "Units: "
 msgstr "Unidades: "
 
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:19
 msgid "Weather settings"
 msgstr "Configuraci�n do tempo"
 
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:21
 msgid "_Display folders:"
 msgstr "_Amosar cartafoles:"
 
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:22
 msgid "_Display stations:"
 msgstr "_Amosar estaci�ns:"
 
-#: my-evolution/my-evolution.glade.h:21
+#: my-evolution/my-evolution.glade.h:23
 msgid "_Displayed feeds:"
 msgstr "Fontes _amosadas:"
 
-#: my-evolution/my-evolution.glade.h:22
+#: my-evolution/my-evolution.glade.h:24
 msgid "_Five days"
 msgstr "_Cinco d�as"
 
-#: my-evolution/my-evolution.glade.h:23
+#: my-evolution/my-evolution.glade.h:25
 msgid "_Mail"
 msgstr "_Correo"
 
-#: my-evolution/my-evolution.glade.h:24
+#: my-evolution/my-evolution.glade.h:26
 msgid "_News Feeds"
 msgstr "Fontes de _Novas"
 
-#: my-evolution/my-evolution.glade.h:25
+#: my-evolution/my-evolution.glade.h:27
 msgid "_One day"
 msgstr "_Un d�a"
 
-#: my-evolution/my-evolution.glade.h:26
-msgid "_Refresh time (seconds):"
-msgstr "Tempo de _refresco (segundos):"
-
-#: my-evolution/my-evolution.glade.h:27
+#: my-evolution/my-evolution.glade.h:28
 msgid "_Schedule"
 msgstr "_Programar"
 
-#: my-evolution/my-evolution.glade.h:28
-msgid "_Show full path for folders"
-msgstr "Amo_sa-las rutas completas dos cartafoles"
-
 #: my-evolution/my-evolution.glade.h:29
 msgid "_Weather"
 msgstr "_Tempo"
@@ -10806,15 +11360,15 @@ msgstr "m_�tricas"
 msgid "The Evolution shell."
 msgstr "O shell de Evolution."
 
-#: shell/e-activity-handler.c:198
+#: shell/e-activity-handler.c:200
 msgid "Show Details"
 msgstr "Amosa-los Detalles"
 
-#: shell/e-activity-handler.c:200
+#: shell/e-activity-handler.c:202
 msgid "Cancel Operation"
 msgstr "Cancelar Operaci�n"
 
-#: shell/e-local-storage.c:175 shell/e-shortcuts.c:1052
+#: shell/e-local-storage.c:175 shell/e-shortcuts.c:1053
 msgid "Inbox"
 msgstr "Entrada"
 
@@ -10822,7 +11376,7 @@ msgstr "Entrada"
 msgid "Outbox"
 msgstr "Sa�da"
 
-#: shell/e-local-storage.c:623
+#: shell/e-local-storage.c:624
 msgid "Local Folders"
 msgstr "Cartafoles Locais"
 
@@ -10902,37 +11456,37 @@ msgstr ""
 "directorio de Evolution. M�vao para poder\n"
 "instalar os ficheiros de usuario de Evolution."
 
-#: shell/e-shell-folder-commands.c:174
+#: shell/e-shell-folder-commands.c:176
 msgid "Cannot move a folder over itself."
 msgstr "Non se pode mover un cartafol a si mesmo."
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:178
 msgid "Cannot copy a folder over itself."
 msgstr "Non se pode copiar un cartafol a si mesmo."
 
-#: shell/e-shell-folder-commands.c:190
+#: shell/e-shell-folder-commands.c:192
 msgid "Cannot move a folder into one of its descendants."
 msgstr "Non se pode mover un cartafol a un dos seus descendentes"
 
-#: shell/e-shell-folder-commands.c:285
+#: shell/e-shell-folder-commands.c:312
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "Indique un cartafol no que copia-lo cartafol \"%s\":"
 
-#: shell/e-shell-folder-commands.c:290
+#: shell/e-shell-folder-commands.c:317
 msgid "Copy folder"
 msgstr "Copiar cartafol"
 
-#: shell/e-shell-folder-commands.c:328
+#: shell/e-shell-folder-commands.c:359
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "Indique un cartafol no que move-lo cartafol \"%s\":"
 
-#: shell/e-shell-folder-commands.c:333
+#: shell/e-shell-folder-commands.c:364
 msgid "Move folder"
 msgstr "Mover cartafol"
 
-#: shell/e-shell-folder-commands.c:358
+#: shell/e-shell-folder-commands.c:390
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -10941,33 +11495,35 @@ msgstr ""
 "Non foi posible borrar o cartafol:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:374
-#, c-format
-msgid "Delete folder '%s'"
-msgstr "Elimina-lo cartafol '%s'"
+#: shell/e-shell-folder-commands.c:406
+#, fuzzy, c-format
+msgid "Delete \"%s\""
+msgstr "Eliminar"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:384
-#, c-format
-msgid "Are you sure you want to remove the '%s' folder?"
+#: shell/e-shell-folder-commands.c:416
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the \"%s\" folder?"
 msgstr "�Est� seguro de que quere borrar o cartafol '%s'?"
 
-#. Popup a dialog asking what the user would like to rename
-#. the folder to
-#: shell/e-shell-folder-commands.c:459
-#, c-format
-msgid "Rename folder '%s'"
-msgstr "Renomea-lo cartafol '%s'"
+#: shell/e-shell-folder-commands.c:470
+#, fuzzy, c-format
+msgid ""
+"Cannot rename folder:\n"
+"%s"
+msgstr ""
+"Non foi posible borrar o cartafol:\n"
+"%s"
 
-#: shell/e-shell-folder-commands.c:463
-msgid "Rename"
-msgstr "Renomear"
+#: shell/e-shell-folder-commands.c:503
+#, fuzzy, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "Renomea-lo cartafol '%s'"
 
-#. Make, pack the label
-#: shell/e-shell-folder-commands.c:471
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "Nome do cartafol:"
+#: shell/e-shell-folder-commands.c:506
+#, fuzzy
+msgid "Rename folder"
+msgstr "Renomea-lo cartafol '%s'"
 
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
@@ -11003,7 +11559,7 @@ msgstr "O nome de cartafol indicado non � v�lido: %s"
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Crear un novo cartafol"
 
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:99
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -11011,15 +11567,19 @@ msgstr ""
 "O tipo do cartafol seleccionado non � v�lido para\n"
 "a operaci�n solicitada."
 
-#: shell/e-shell-folder-selection-dialog.c:348
+#: shell/e-shell-folder-selection-dialog.c:360
 msgid "New..."
 msgstr "Nova..."
 
-#: shell/e-shell-folder-title-bar.c:582 shell/e-shell-folder-title-bar.c:583
+#: shell/e-shell-folder-title-bar.c:585 shell/e-shell-folder-title-bar.c:586
 msgid "(Untitled)"
 msgstr "(Sen_t�tulo)"
 
-#: shell/e-shell-importer.c:97
+#: shell/e-shell-importer.c:141
+msgid "Choose the type of importer to run"
+msgstr ""
+
+#: shell/e-shell-importer.c:144
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -11033,9 +11593,13 @@ msgstr ""
 "Pode seleccionar \"Autom�tico\" se non o sabe, e Evolution tentar� "
 "averigualo."
 
+#: shell/e-shell-importer.c:150
+msgid "Please select the information that you would like to import"
+msgstr ""
+
 #. Importer isn't ready yet.
 #. Wait 5 seconds and try again.
-#: shell/e-shell-importer.c:192
+#: shell/e-shell-importer.c:242
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11046,7 +11610,7 @@ msgstr ""
 "O importador non est� preparado.\n"
 "Agardando 5 segundos antes de tentalo de novo."
 
-#: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
+#: shell/e-shell-importer.c:262 shell/e-shell-importer.c:293
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11055,7 +11619,16 @@ msgstr ""
 "Importando %s\n"
 "Importando elemento %d."
 
-#: shell/e-shell-importer.c:350
+#: shell/e-shell-importer.c:396
+#, fuzzy, c-format
+msgid "File %s does not exist"
+msgstr "O cartafol `%s' non existe."
+
+#: shell/e-shell-importer.c:408
+msgid "You may only import to local folders"
+msgstr ""
+
+#: shell/e-shell-importer.c:423
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -11064,11 +11637,11 @@ msgstr ""
 "Non hai importador capaz de manexar\n"
 "%s"
 
-#: shell/e-shell-importer.c:362
+#: shell/e-shell-importer.c:433
 msgid "Importing"
 msgstr "Importando"
 
-#: shell/e-shell-importer.c:370
+#: shell/e-shell-importer.c:441
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -11077,17 +11650,17 @@ msgstr ""
 "Importando %s.\n"
 "Comezando %s"
 
-#: shell/e-shell-importer.c:383
+#: shell/e-shell-importer.c:454
 #, c-format
 msgid "Error starting %s"
 msgstr "Erro ao iniciar %s"
 
-#: shell/e-shell-importer.c:402
+#: shell/e-shell-importer.c:473
 #, c-format
 msgid "Error loading %s"
 msgstr "Erro ao cargar %s"
 
-#: shell/e-shell-importer.c:417
+#: shell/e-shell-importer.c:490
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11096,35 +11669,65 @@ msgstr ""
 "Importando %s\n"
 "Importando elemento 1."
 
-#: shell/e-shell-importer.c:488
+#: shell/e-shell-importer.c:560
 msgid "Automatic"
 msgstr "Autom�tico"
 
-#: shell/e-shell-importer.c:538
+#: shell/e-shell-importer.c:611
 msgid "Filename:"
 msgstr "Nome do ficheiro:"
 
-#: shell/e-shell-importer.c:543
+#: shell/e-shell-importer.c:616
 msgid "Select a file"
 msgstr "Seleccionar un ficheiro"
 
-#: shell/e-shell-importer.c:553
+#: shell/e-shell-importer.c:626
 msgid "File type:"
 msgstr "Tipo de ficheiro:"
 
-#: shell/e-shell-importer.c:622
+#: shell/e-shell-importer.c:651
+msgid "Import data and settings from older programs"
+msgstr ""
+
+#: shell/e-shell-importer.c:655
+#, fuzzy
+msgid "Import a single file"
+msgstr "Importar un formato de ficheiro externo"
+
+#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:582
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+"Agarde...\n"
+"Buscando configuraci�ns existentes"
+
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:585
+msgid "Starting Intelligent Importers"
+msgstr "Iniciando os Importadores Intelixentes"
+
+#: shell/e-shell-importer.c:840 shell/e-shell-startup-wizard.c:703
+#, fuzzy, c-format
+msgid "From %s:"
+msgstr "De:"
+
+#: shell/e-shell-importer.c:1003
 msgid "Select folder"
 msgstr "Seleccionar cartafol"
 
-#: shell/e-shell-importer.c:623
+#: shell/e-shell-importer.c:1004
 msgid "Select a destination folder for importing this data"
 msgstr "Escolla un cartafol de destino para importar estes datos"
 
-#: shell/e-shell-offline-handler.c:564
+#: shell/e-shell-importer.c:1116 shell/importer/intelligent.c:194
+msgid "Import"
+msgstr "Importar"
+
+#: shell/e-shell-offline-handler.c:562
 msgid "Closing connections..."
 msgstr "Pechando as conexi�ns..."
 
-#: shell/e-shell-startup-wizard.c:161
+#: shell/e-shell-startup-wizard.c:159
 #, c-format
 msgid ""
 "Could not start the Evolution Mailer Wizard interface\n"
@@ -11133,37 +11736,37 @@ msgstr ""
 "Non se puido inicia-la interface do Mago de Correo de Evolution\n"
 "%s"
 
-#: shell/e-shell-startup-wizard.c:170
+#: shell/e-shell-startup-wizard.c:168
 msgid "Cannot initialize the Evolution Mailer Wizard interface"
 msgstr "Non se pode inicializar a interface do Mago do Correo de Evolution."
 
-#: shell/e-shell-startup-wizard.c:580
+#: shell/e-shell-startup-wizard.c:745
 msgid ""
-"Please wait...\n"
-"Scanning for existing setups"
+"Please select the information\n"
+"that you would like to import"
 msgstr ""
-"Agarde...\n"
-"Buscando configuraci�ns existentes"
 
-#: shell/e-shell-startup-wizard.c:583
-msgid "Starting Intelligent Importers"
-msgstr "Iniciando os Importadores Intelixentes"
-
-#: shell/e-shell-view-menu.c:183
+#: shell/e-shell-view-menu.c:201
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Non se atopou o Bug buddy no seu $PATH."
 
-#: shell/e-shell-view-menu.c:191
+#: shell/e-shell-view-menu.c:209
 msgid "Bug buddy could not be run."
 msgstr "Non foi posible executar o Bug buddy."
 
-#: shell/e-shell-view-menu.c:219
+#: shell/e-shell-view-menu.c:235
+#, fuzzy
+msgid "Ximian Evolution"
+msgstr "Evolution"
+
+#: shell/e-shell-view-menu.c:237
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:221
+#: shell/e-shell-view-menu.c:239
+#, fuzzy
 msgid ""
-"Evolution is a suite of groupware applications\n"
+"Ximian Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
 "within the GNOME desktop environment."
 msgstr ""
@@ -11171,28 +11774,37 @@ msgstr ""
 "en grupo para xesti�n de correo, axenda e contactos\n"
 "dentro do ambiente de escritorio GNOME."
 
-#: shell/e-shell-view-menu.c:423
+#: shell/e-shell-view-menu.c:442
 msgid "Go to folder..."
 msgstr "Ir � cartafol..."
 
-#: shell/e-shell-view-menu.c:424
+#: shell/e-shell-view-menu.c:443
 msgid "Select the folder that you want to open"
 msgstr "Seleccione o cartafol a abrir"
 
-#: shell/e-shell-view-menu.c:569
+#: shell/e-shell-view-menu.c:563
 msgid "Create a new shortcut"
 msgstr "Crear un novo atallo"
 
-#: shell/e-shell-view-menu.c:570
+#: shell/e-shell-view-menu.c:564
 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:684
+#: shell/e-shell-view-menu.c:595
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:603
+#, fuzzy, c-format
+msgid "Error executing %s."
+msgstr "Erro ao executar o filtro: %s: %s"
+
+#: shell/e-shell-view-menu.c:705
 msgid "Work Online"
 msgstr "Traballar Conectado"
 
-#: shell/e-shell-view-menu.c:697 shell/e-shell-view-menu.c:710
-#: ui/evolution.xml.h:31
+#: shell/e-shell-view-menu.c:718 shell/e-shell-view-menu.c:731
+#: ui/evolution.xml.h:30
 msgid "Work Offline"
 msgstr "Traballar Desconectado"
 
@@ -11200,43 +11812,48 @@ msgstr "Traballar Desconectado"
 msgid "(No folder displayed)"
 msgstr "(Ning�n cartafol visualizado)"
 
-#: shell/e-shell-view.c:1495
+#: shell/e-shell-view.c:1512
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1497
+#: shell/e-shell-view.c:1514
 msgid "(None)"
 msgstr "(Nada)"
 
-#: shell/e-shell-view.c:1502
-#, c-format
-msgid "%s - Evolution %s"
+#: shell/e-shell-view.c:1519
+#, fuzzy, c-format
+msgid "%s - Ximian Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1504
-#, c-format
-msgid "%s - Evolution %s [%s]"
+#: shell/e-shell-view.c:1521
+#, fuzzy, c-format
+msgid "%s - Ximian Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell-view.c:1544
-msgid "Evolution is currently online.  Click on this button to work offline."
+#: shell/e-shell-view.c:1561
+#, 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:1551
-msgid "Evolution is in the process of going offline."
+#: shell/e-shell-view.c:1568
+#, fuzzy
+msgid "Ximian Evolution is in the process of going offline."
 msgstr "Evolution est� desconect�ndose"
 
-#: shell/e-shell-view.c:1557
-msgid "Evolution is currently offline.  Click on this button to work online."
+#: shell/e-shell-view.c:1574
+#, 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:509
+#: shell/e-shell.c:562
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Non se pode activar o armacenamento local -- %s"
 
-#: shell/e-shell.c:1438
+#: shell/e-shell.c:1488
 #, c-format
 msgid ""
 "Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
@@ -11245,35 +11862,35 @@ msgstr ""
 "Ooops!  As vistas de `%s' morreron inesperadamente.  :-(\n"
 "Isto significa probablemente que o compo�ente %s se estragou."
 
-#: shell/e-shell.c:1642 widgets/misc/e-cell-date-edit.c:248
+#: shell/e-shell.c:1692 widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "Aceptar"
 
-#: shell/e-shell.c:1644
+#: shell/e-shell.c:1694
 msgid "Invalid arguments"
 msgstr "Argumentos non v�lidos"
 
-#: shell/e-shell.c:1646
+#: shell/e-shell.c:1696
 msgid "Cannot register on OAF"
 msgstr "Non se pode rexistrar en OAF"
 
-#: shell/e-shell.c:1648
+#: shell/e-shell.c:1698
 msgid "Configuration Database not found"
 msgstr "Non se atopou a Base de Datos de configuraci�ns"
 
-#: shell/e-shell.c:1650 shell/e-storage.c:491
+#: shell/e-shell.c:1700 shell/e-storage.c:496
 msgid "Generic error"
 msgstr "Erro xen�rico"
 
-#: shell/e-shortcuts-view.c:73
+#: shell/e-shortcuts-view.c:75
 msgid "Create new shortcut group"
 msgstr "Crear un novo grupo de atallos"
 
-#: shell/e-shortcuts-view.c:74
+#: shell/e-shortcuts-view.c:76
 msgid "Group name:"
 msgstr "Nome do grupo:"
 
-#: shell/e-shortcuts-view.c:174
+#: shell/e-shortcuts-view.c:176
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -11282,164 +11899,173 @@ msgstr ""
 "�Realmente desexa eliminar o grupo\n"
 "`%s' da barra de atallos?"
 
-#: shell/e-shortcuts-view.c:179
+#: shell/e-shortcuts-view.c:181
 msgid "Don't remove"
 msgstr "Non eliminar"
 
-#: shell/e-shortcuts-view.c:207
+#: shell/e-shortcuts-view.c:210
 msgid "Rename Shortcut Group"
 msgstr "Renomear Grupo de Atallos"
 
-#: shell/e-shortcuts-view.c:208
+#: shell/e-shortcuts-view.c:211
 msgid "Rename selected shortcut group to:"
 msgstr "Renomear o grupo de atallos seleccionado a:"
 
-#: shell/e-shortcuts-view.c:221
+#: shell/e-shortcuts-view.c:225
 msgid "_Small Icons"
 msgstr "Iconas _Pequenas"
 
-#: shell/e-shortcuts-view.c:222
+#: shell/e-shortcuts-view.c:226
 msgid "Show the shortcuts as small icons"
 msgstr "Amosar os atallos como iconas pequenas"
 
-#: shell/e-shortcuts-view.c:224
+#: shell/e-shortcuts-view.c:228
 msgid "_Large Icons"
 msgstr "Iconas _Grandes"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:229
 msgid "Show the shortcuts as large icons"
 msgstr "Amosar os atallos como iconas grandes"
 
-#: shell/e-shortcuts-view.c:236
+#: shell/e-shortcuts-view.c:240
 msgid "_New Group..."
 msgstr "_Novo Grupo..."
 
-#: shell/e-shortcuts-view.c:237
+#: shell/e-shortcuts-view.c:241
 msgid "Create a new shortcut group"
 msgstr "Crear un novo grupo de atallos"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:243
 msgid "_Remove this Group..."
 msgstr "_Eliminar este Grupo..."
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:244
 msgid "Remove this shortcut group"
 msgstr "Eliminar este grupo de atallos"
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:246
 msgid "Re_name this Group..."
 msgstr "Re_nomear este Grupo..."
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:247
 msgid "Rename this shortcut group"
 msgstr "Renomear este grupo de atallos"
 
-#: shell/e-shortcuts-view.c:248
+#: shell/e-shortcuts-view.c:252
 msgid "_Hide the Shortcut Bar"
 msgstr "Agochar a Barra de _Atallos"
 
-#: shell/e-shortcuts-view.c:249
+#: shell/e-shortcuts-view.c:253
 msgid "Hide the shortcut bar"
 msgstr "Agochar a barra de atallos"
 
-#: shell/e-shortcuts-view.c:368
+#: shell/e-shortcuts-view.c:372
 msgid "Rename shortcut"
 msgstr "Renomear atallo"
 
-#: shell/e-shortcuts-view.c:369
+#: shell/e-shortcuts-view.c:373
 msgid "Rename selected shortcut to:"
 msgstr "Renomea-lo atallo seleccionado a:"
 
-#: shell/e-shortcuts-view.c:381
+#: shell/e-shortcuts-view.c:385
 msgid "Open the folder linked to this shortcut"
 msgstr "Abrir o cartafol ligado a este atallo"
 
-#: shell/e-shortcuts-view.c:383 ui/evolution.xml.h:20
+#: shell/e-shortcuts-view.c:387 ui/evolution.xml.h:19
 msgid "Open in New _Window"
 msgstr "Abrir nunha Nova _Fiestra"
 
-#: shell/e-shortcuts-view.c:383
+#: shell/e-shortcuts-view.c:387
 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:386
+#: shell/e-shortcuts-view.c:390
 msgid "_Rename"
 msgstr "_Renomear"
 
-#: shell/e-shortcuts-view.c:386
+#: shell/e-shortcuts-view.c:390
 msgid "Rename this shortcut"
 msgstr "Renomear este atallo"
 
-#: shell/e-shortcuts-view.c:388
+#: shell/e-shortcuts-view.c:392
 msgid "Re_move"
 msgstr "Eli_minar"
 
-#: shell/e-shortcuts-view.c:388
+#: shell/e-shortcuts-view.c:392
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Eliminar este atallo da barra de atallos"
 
-#: shell/e-shortcuts.c:642
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "Erro ao gardar os atallos."
 
-#: shell/e-shortcuts.c:1043
+#: shell/e-shortcuts.c:1044
 msgid "Shortcuts"
 msgstr "Atallos"
 
+#: shell/e-storage-set-view.c:645
+#, fuzzy, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr ""
+"Non foi posible borrar o cartafol:\n"
+"%s"
+
 #: shell/e-storage.c:182 shell/e-storage.c:188
 msgid "(No name)"
 msgstr "(Sen nome)"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:494
 msgid "No error"
 msgstr "Sen erros"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:498
 msgid "A folder with the same name already exists"
 msgstr "Xa existe un cartafol co mesmo nome"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:500
 msgid "The specified folder type is not valid"
 msgstr "O tipo do cartafol indicado non � v�lido"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:502
 msgid "I/O error"
 msgstr "Erro de E/S"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:504
 msgid "Not enough space to create the folder"
 msgstr "Non hai espacio dabondo para crear o cartafol"
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:506
 msgid "The specified folder was not found"
 msgstr "Non se atopou o cartafol indicado"
 
-#: shell/e-storage.c:503
+#: shell/e-storage.c:508
 msgid "Function not implemented in this storage"
 msgstr "Funci�n non implementada neste medio de armacenamento"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:512
 msgid "Operation not supported"
 msgstr "Operaci�n non soportada"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:514
 msgid "The specified type is not supported in this storage"
 msgstr "O tipo especificado non est� soportado neste almacenamento"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:516
 msgid "The specified folder cannot be modified or removed"
 msgstr "O cartafol especificado non se pode modificar ou eliminar"
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:518
 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-task-widget.c:170
+#: shell/e-task-widget.c:192
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: shell/e-task-widget.c:175
+#: shell/e-task-widget.c:197
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% completa)"
@@ -11460,6 +12086,10 @@ msgstr "Servidor"
 msgid "The following connections are currently active:"
 msgstr "As seguintes conexi�ns est�n activas nestes intres:"
 
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr "Nome do cartafol:"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder type:"
 msgstr "Tipo do cartafol:"
@@ -11511,14 +12141,26 @@ msgid "Evolution Importer Assistant"
 msgstr "Asistente Importador de Evolution"
 
 #: shell/importer/import.glade.h:4
-msgid "Import File (Step 2 of 2)"
+#, fuzzy
+msgid "Import File (step 3 of 3)"
 msgstr "Importar Ficheiro (Paso 2 de 2)"
 
 #: shell/importer/import.glade.h:5
-msgid "Select a File (step 1 of 2)"
-msgstr "Seleccionar un Ficheiro (Paso 1 de 2)"
+#, fuzzy
+msgid "Importer Type (step 1 of 3)"
+msgstr "Importar Ficheiro (Paso 2 de 2)"
 
 #: shell/importer/import.glade.h:6
+#, fuzzy
+msgid "Select Importers (step 2 of 3)"
+msgstr "Seleccionar un Ficheiro (Paso 1 de 2)"
+
+#: shell/importer/import.glade.h:7
+#, fuzzy
+msgid "Select a File (step 2 of 3)"
+msgstr "Seleccionar un Ficheiro (Paso 1 de 2)"
+
+#: shell/importer/import.glade.h:8
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of\n"
@@ -11544,13 +12186,18 @@ 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:95
-#, no-c-format
+#: shell/main.c:82
+#, fuzzy
+msgid "Evolution is now exiting ..."
+msgstr "_Fiestra de Evolution"
+
+#: shell/main.c:153
+#, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Evolution groupware suite.\n"
+"of the Ximian Evolution groupware suite.\n"
 "\n"
-"Evolution is not yet complete. It's getting close, but there are\n"
+"Ximian Evolution is not yet complete. It's getting close, but there are\n"
 "places where features are either missing or only half working. \n"
 "\n"
 "If you find bugs, please report them to us at bugzilla.ximian.com.\n"
@@ -11573,32 +12220,34 @@ msgstr ""
 "Esperamos que desfrute do resultado do noso duro traballo, e\n"
 "agardamos con impaciencia polas s�as colaboraci�ns.\n"
 
-#: shell/main.c:116
+#: shell/main.c:174
+#, fuzzy
 msgid ""
 "Thanks\n"
-"The Evolution Team\n"
+"The Ximian Evolution Team\n"
 msgstr ""
 "Graci�as\n"
 "O Equipo de Evolution\n"
 
-#: shell/main.c:173
-msgid "Cannot access the Evolution shell."
+#: shell/main.c:231
+#, fuzzy
+msgid "Cannot access the Ximian Evolution shell."
 msgstr "Non se pode acceder ao shell de Evolution."
 
-#: shell/main.c:184
-#, c-format
-msgid "Cannot initialize the Evolution shell: %s"
+#: shell/main.c:242
+#, fuzzy, c-format
+msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Non se pode inicializar o shell de Evolution: %s"
 
-#: shell/main.c:228
+#: shell/main.c:286
 msgid "Disable splash screen"
 msgstr "Desactivar a pantalla inicial"
 
-#: shell/main.c:229
+#: shell/main.c:287
 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:271
+#: shell/main.c:329
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Non se pode inicializar o sistema de compo�entes de Bonobo."
 
@@ -11708,35 +12357,28 @@ msgstr "_Contacto"
 msgid "_Contact List"
 msgstr "Lista de _Contactos"
 
-#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:35 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "_Remitir Contacto..."
 
-#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:40
+#: ui/evolution-addressbook.xml.h:37 ui/evolution-calendar.xml.h:41
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:95
 #: ui/my-evolution.xml.h:7
 msgid "_Print..."
 msgstr "_Imprimir..."
 
-#: ui/evolution-addressbook.xml.h:37
+#: ui/evolution-addressbook.xml.h:38
 msgid "_Save as VCard"
 msgstr "_Gardar coma VCard"
 
-#: ui/evolution-addressbook.xml.h:38
+#: ui/evolution-addressbook.xml.h:39
 msgid "_Search for Contacts"
 msgstr "_Buscar Contactos"
 
-#: ui/evolution-addressbook.xml.h:39
+#: ui/evolution-addressbook.xml.h:40
 msgid "_Select All"
 msgstr "_Seleccionar Todo"
 
-#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:43
-#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
-#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:18
-#: ui/my-evolution.xml.h:9
-msgid "_Tools"
-msgstr "_Ferramentas"
-
 #: ui/evolution-calendar.xml.h:2
 msgid "Configure the calendar's settings"
 msgstr "Configura-la axenda"
@@ -11845,11 +12487,11 @@ msgstr "_Cita..."
 msgid "_Calendar Settings..."
 msgstr "_Preferencias da Axenda..."
 
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:42
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicar Informaci�n de Libre/Ocupado"
 
-#: ui/evolution-calendar.xml.h:42
+#: ui/evolution-calendar.xml.h:43
 msgid "_Task..."
 msgstr "_Tarefa..."
 
@@ -11870,7 +12512,7 @@ msgid "Delete this item"
 msgstr "Borrar este elemento"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "Barra de ferramentas principal"
 
@@ -11886,14 +12528,13 @@ msgstr "Imprimir este elemento"
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:7
-#: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-list-editor.xml.h:5
 #: ui/evolution-message-composer.xml.h:19
 #: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:245
 msgid "Save"
 msgstr "Gardar"
 
-#: ui/evolution-comp-editor.xml.h:14
+#: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
 msgid "Save and Close"
 msgstr "Gardar e Pechar"
 
@@ -11908,9 +12549,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:49
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:37
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:36
 msgid "_File"
 msgstr "_Ficheiro"
 
@@ -11918,7 +12559,7 @@ msgstr "_Ficheiro"
 msgid "Print En_velope..."
 msgstr "Imprimir So_bre..."
 
-#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:6
 #: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
@@ -11930,8 +12571,8 @@ msgstr "Gardar o contacto e pechar a caixa de di�logo"
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:54
-#: ui/evolution-signature-editor.xml.h:11
+#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Save"
 msgstr "_Gardar"
 
@@ -12037,7 +12678,8 @@ msgstr "Abrir unha fiestra para compo�er unha mensaxe de correo"
 
 #: ui/evolution-mail-global.xml.h:12
 msgid "Permanently remove all deleted messages from all folders"
-msgstr "Eliminar t�dalas mensaxes borradas en t�dolos cartafoles de xeito permanente"
+msgstr ""
+"Eliminar t�dalas mensaxes borradas en t�dolos cartafoles de xeito permanente"
 
 #: ui/evolution-mail-global.xml.h:13
 msgid "Send / Receive"
@@ -12174,23 +12816,23 @@ msgstr "Agochar temporalmente as mensaxes seleccionadas"
 msgid "Threaded Message list"
 msgstr "Lista de Mensaxes por F�os"
 
-#: ui/evolution-mail-list.xml.h:25
+#: ui/evolution-mail-list.xml.h:26
 msgid "_Expunge"
 msgstr "_Limpar"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:38
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
 msgid "_Folder"
 msgstr "_Cartafol"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail-list.xml.h:28 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "_Inverter Selecci�n"
 
-#: ui/evolution-mail-list.xml.h:29
+#: ui/evolution-mail-list.xml.h:30
 msgid "_Properties..."
 msgstr "_Propiedades..."
 
-#: ui/evolution-mail-list.xml.h:30
+#: ui/evolution-mail-list.xml.h:31
 msgid "_Threaded Message List"
 msgstr "Lis_ta de Mensaxes por F�os"
 
@@ -12523,6 +13165,11 @@ msgstr "Visualizaci�n _Normal"
 msgid "_Open Message"
 msgstr "_Abrir Mensaxe"
 
+#: ui/evolution-mail-message.xml.h:98 ui/evolution.xml.h:49
+#: ui/my-evolution.xml.h:9
+msgid "_Tools"
+msgstr "_Ferramentas"
+
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Pechar esta fiestra"
@@ -12534,8 +13181,8 @@ msgstr "Pechar esta fiestra"
 msgid "_Close"
 msgstr "_Pechar"
 
-#: ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:49
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:50
 msgid "_View"
 msgstr "_Vista"
 
@@ -12697,36 +13344,31 @@ msgid "_Cc Field"
 msgstr "Campo _Cc"
 
 #: ui/evolution-message-composer.xml.h:46
-#: ui/evolution-signature-editor.xml.h:6
-msgid "_Debug"
-msgstr "_Depuraci�n"
-
-#: ui/evolution-message-composer.xml.h:47
 msgid "_Delete all"
 msgstr "_Borrar todo"
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:49
 msgid "_From Field"
 msgstr "Campo _Desde"
 
-#: ui/evolution-message-composer.xml.h:51
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-signature-editor.xml.h:9
 msgid "_Insert"
 msgstr "_Inserir"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:51
 msgid "_Open..."
 msgstr "_Abrir..."
 
-#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Reply-To Field"
 msgstr "Campo _Responder-A"
 
-#: ui/evolution-message-composer.xml.h:55
+#: ui/evolution-message-composer.xml.h:54
 msgid "_Security"
 msgstr "_Seguridade"
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:41
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "A_xuda"
 
@@ -12806,12 +13448,13 @@ msgstr "Pegar a tarefa dende o portarretallos"
 msgid "Tasks Settings..."
 msgstr "Preferencias das Tarefas..."
 
-#: ui/evolution-tasks.xml.h:17
+#: ui/evolution-tasks.xml.h:18
 msgid "_Task"
 msgstr "_Tarefa"
 
 #: ui/evolution.xml.h:1
-msgid "About Evolution..."
+#, fuzzy
+msgid "About Ximian Evolution..."
 msgstr "Acerca de Evolution..."
 
 #: ui/evolution.xml.h:2
@@ -12851,101 +13494,110 @@ msgid "E_xit"
 msgstr "_Sa�r"
 
 #: ui/evolution.xml.h:13
-msgid "Evolution _FAQ"
-msgstr "_FAQ de Evolution"
-
-#: ui/evolution.xml.h:14
 msgid "Evolution _Window"
 msgstr "_Fiestra de Evolution"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:14
 msgid "Exit the program"
 msgstr "Sa�r do programa"
 
-#: ui/evolution.xml.h:16
-msgid "Import an external file format"
-msgstr "Importar un formato de ficheiro externo"
+#: ui/evolution.xml.h:15
+msgid "Import data from other programs"
+msgstr ""
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:17
 msgid "Move this folder to another place"
 msgstr "Mover este cartafol a outro sitio"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:18
 msgid "Open in New Window"
 msgstr "Abrir nunha Nova Fiestra"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:20
 msgid "Open this folder in an other window"
 msgstr "Abrir este cartafol noutra fiestra"
 
-#: ui/evolution.xml.h:22
-msgid "Show information about Evolution"
+#: ui/evolution.xml.h:21
+#, fuzzy
+msgid "Show information about Ximian Evolution"
 msgstr "Amosar informaci�n sobre Evolution"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:22
 msgid "Submit Bug Report"
 msgstr "Enviar un Informe de Erro"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:23
 msgid "Submit _Bug Report"
 msgstr "_Enviar un Informe de Erro"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:24
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Enviar un informe de erro usando o Bug Buddy"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:25
 msgid "Toggle"
 msgstr "Trocar"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:26
 msgid "Toggle whether to show the folder bar"
 msgstr "Trocar a mostra da barra de cartafoles"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:27
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Trocar a mostra da barra de atallos"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:28
 msgid "Toggle whether we are working offline."
 msgstr "Trocar entre traballo conectado e desconectado"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:29
 msgid "View the selected folder"
 msgstr "Ver o cartafol seleccionado"
 
+#: ui/evolution.xml.h:31
+#, fuzzy
+msgid "Ximian Evolution _FAQ"
+msgstr "_FAQ de Evolution"
+
 #: ui/evolution.xml.h:32
-msgid "_About Evolution..."
+#, fuzzy
+msgid "_About Ximian Evolution..."
 msgstr "_Acerca de Evolution..."
 
 #: ui/evolution.xml.h:34
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:38
 msgid "_Folder Bar"
 msgstr "Barra de _Cartafoles"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:39
 msgid "_Go to Folder..."
 msgstr "_Ir � Cartafol..."
 
-#: ui/evolution.xml.h:42
-msgid "_Import File..."
-msgstr "_Importar Ficheiro..."
+#: ui/evolution.xml.h:41
+#, fuzzy
+msgid "_Import..."
+msgstr "Importando..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:42
 msgid "_Move..."
 msgstr "_Mover..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:43
 msgid "_New"
 msgstr "_Novo"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:44
 msgid "_New Folder"
 msgstr "_Novo Cartafol"
 
+#: ui/evolution.xml.h:45
+#, fuzzy
+msgid "_Pilot Settings..."
+msgstr "_Preferencias de Correo..."
+
 #: ui/evolution.xml.h:46
 msgid "_Rename..."
 msgstr "_Renomear..."
@@ -12958,7 +13610,7 @@ msgstr "_Atallo"
 msgid "_Shortcut Bar"
 msgstr "Barra de _Atallos"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:51
 msgid "_Work Offline"
 msgstr "_Traballar Desconectado"
 
@@ -13036,81 +13688,6 @@ msgstr ""
 "escoller un fuso horario.\n"
 " Empregue o bot�n dereito para alonxarse."
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d de %B de %Y"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:394
-msgid "Out of Office"
-msgstr "F�ra da Oficina"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:395
-msgid "No Information"
-msgstr "Sen Informaci�n"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:411
-msgid "_Invite Others..."
-msgstr "_Convidar Outros..."
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:431
-msgid "_Options"
-msgstr "_Opci�ns"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:448
-msgid "Show _Only Working Hours"
-msgstr "Amosar _S� as Horas de Traballo"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:461
-msgid "Show _Zoomed Out"
-msgstr "Amozar sen _Zoom"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:479
-msgid "_Update Free/Busy"
-msgstr "_Actualizar Libres/Ocupadas"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:497
-msgid "_<<"
-msgstr "_<<"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:514
-msgid "_Autopick"
-msgstr "_Autoescoller"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:528
-msgid ">_>"
-msgstr ">_>"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:545
-msgid "_All People and Resources"
-msgstr "_T�dalas Persoas e Recursos"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:558
-msgid "All _People and One Resource"
-msgstr "T�dalas _Persoas e Un Recurso"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:571
-msgid "_Required People"
-msgstr "Persoas _Requiridas"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:584
-msgid "Required People and _One Resource"
-msgstr "Persoas Requiridas e _Un Recurso"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:607
-msgid "Meeting _start time:"
-msgstr "Hora do _inicio da reuni�n:"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:631
-msgid "Meeting _end time:"
-msgstr "Hora do _final da reuni�n:"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:744
-msgid "All Attendees"
-msgstr "T�dolos Asistentes"
-
 #: widgets/menus/gal-view-menus.c:218
 msgid "_Current View"
 msgstr "_Vista Actual"
@@ -13130,11 +13707,11 @@ msgstr "LMMXVSD"
 msgid "%B %Y"
 msgstr "%B de %Y"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:433
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:439
 msgid "Now"
 msgstr "Agora"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:445
 msgid "Today"
 msgstr "Hoxe"
 
@@ -13277,819 +13854,1042 @@ 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:173
+#: wombat/wombat.c:176
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): non foi posible inicializar GNOME-VFS"
 
-#: wombat/wombat.c:185
+#: wombat/wombat.c:188
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): non foi posible inicializar GNOME"
 
-#: wombat/wombat.c:198
+#: wombat/wombat.c:201
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 
-msgid "Spool stores do not have an inbox"
-msgstr "Os armacenamentos de spools non te�en un inbox"
+#~ msgid "Factory for the Evolution addressbook component."
+#~ msgstr "F�brica para o compo�ente Libro de Enderezos de Evolution."
 
-msgid "Standard Unix mailbox file"
-msgstr "Ficheiro mailbox est�ndar de Unix"
+#~ msgid "Unable to get local storage.  This should never happen."
+#~ msgstr ""
+#~ "Non foi posible obter armacenamento local. Isto nunca debeu ter pasado."
 
-msgid "Unix mbox spool-format mail files"
-msgstr "Ficheiros de correo con formato de spool mbox de Unix"
+#~ msgid "123"
+#~ msgstr "123"
 
-msgid ""
-"For connecting to POP servers. The POP protocol can also be used to retrieve "
-"mail from certain web mail providers and proprietary email systems."
-msgstr ""
-"Para conectarse a servidores POP. O protocolo POP tam�n se pode usar para "
-"recibir correo de certos provedores de correo web e sistemas de email "
-"propietarios."
+#~ msgid "a"
+#~ msgstr "a"
 
-msgid "???"
-msgstr "???"
+#~ msgid "b"
+#~ msgstr "b"
 
-msgid "C_ontacts..."
-msgstr "C_ontactos..."
+#~ msgid "c"
+#~ msgstr "c"
 
-msgid "_Company:"
-msgstr "_Compa��a:"
+#~ msgid "d"
+#~ msgstr "d"
 
-msgid "USA"
-msgstr "Estados Unidos"
+#~ msgid "e"
+#~ msgstr "e"
 
-msgid "As _Minicards"
-msgstr "Como _Minitarxetas"
+#~ msgid "f"
+#~ msgstr "f"
 
-msgid "As _Table"
-msgstr "Como unha _T�boa"
+#~ msgid "g"
+#~ msgstr "g"
 
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-"Non foi posible abrir este libro de enderezos. Isto\n"
-"significa que introduciu un URI incorrecto, ou que se\n"
-"tentou acceder a un servidor LDAP e o programa non\n"
-"est� compilado con soporte LDAP. Se introduciu un URI\n"
-"comprobe que sexa correcto e volva introducilo.\n"
-"Sen�n, probablemente tentou acceder a un servidor LDAP.\n"
-"Se desexa poder usar LDAP, necesitar� baixar e\n"
-"instalar OpenLDAP e recompilar e instalar Evolution.\n"
+#~ msgid "h"
+#~ msgstr "h"
 
-msgid "Unknown addressbook type"
-msgstr "Tipo de libro de enderezos desco�ecido"
+#~ msgid "i"
+#~ msgstr "i"
 
-msgid "None (anonymous mode)"
-msgstr "Ning�n (modo an�nimo)"
+#~ msgid "j"
+#~ msgstr "j"
 
-msgid "SASL"
-msgstr "SASL"
+#~ msgid "k"
+#~ msgstr "k"
 
-msgid "Unknown auth type"
-msgstr "Tipo de autenticaci�n desco�ecido"
+#~ msgid "l"
+#~ msgstr "l"
 
-msgid "Subtree"
-msgstr "Sub�rbore"
+#~ msgid "m"
+#~ msgstr "m"
 
-msgid "Unknown scope type"
-msgstr "Tipo de �mbito desco�ecido"
+#~ msgid "n"
+#~ msgstr "n"
 
-msgid "Bind DN:"
-msgstr "Asignar DN:"
+#~ msgid "o"
+#~ msgstr "o"
 
-msgid "FIXME Bind DN Help text here"
-msgstr "AM��AME Texto de axuda para Asignar DN aqu�"
+#~ msgid "p"
+#~ msgstr "p"
 
-msgid "FIXME Host help text here."
-msgstr "AM��AME Texto de axuda para Servidor aqu�"
+#~ msgid "q"
+#~ msgstr "q"
 
-msgid "FIXME Port help text here."
-msgstr "AM��AME Texto de axuda para Porto aqu�"
+#~ msgid "r"
+#~ msgstr "r"
 
-msgid "Root DN:"
-msgstr "DN Ra�z:"
+#~ msgid "s"
+#~ msgstr "s"
 
-msgid "FIXME Root DN help text here."
-msgstr "AM��AME Texto de axuda para DN Ra�z aqu�"
+#~ msgid "t"
+#~ msgstr "t"
 
-msgid "Authentication:"
-msgstr "Autenticaci�n:"
+#~ msgid "u"
+#~ msgstr "u"
 
-msgid "FIXME Path Help text here"
-msgstr "AM��AME Texto de axuda para Ruta aqu�"
+#~ msgid "v"
+#~ msgstr "v"
 
-msgid "Create path if it doesn't exist."
-msgstr "Crear ruta se non existe."
+#~ msgid "w"
+#~ msgstr "w"
 
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr ""
-"Escolla a clase de Libro de Enderezos que ten, e introduza a informaci�n "
-"relevante sobre el."
+#~ msgid "x"
+#~ msgstr "x"
 
-msgid "FIXME Name help text here"
-msgstr "AM��AME Texto de axuda para Nome aqu�"
+#~ msgid "y"
+#~ msgstr "y"
 
-msgid "FIXME Description help text here"
-msgstr "AM��AME Texto de axuda para Descrici�n aqu�"
+#~ msgid "z"
+#~ msgstr "z"
 
-msgid "Edit"
-msgstr "Editar"
+#~ msgid "Done."
+#~ msgstr "Feito."
 
-msgid "Name"
-msgstr "Nome:"
+#~ msgid "Factory for the Evolution calendar component."
+#~ msgstr "F�brica para o compo�ente da axenda de Evolution."
 
-msgid "URI"
-msgstr "URI"
+#~ msgid "Reminder of your appointment at "
+#~ msgstr "Recordatorio da cita en "
 
-msgid "Find..."
-msgstr "Buscar..."
+#~ msgid "Snooze"
+#~ msgstr "Adiar"
 
-msgid "Select name from:"
-msgstr "Seleccionar nome dende:"
+#~ msgid "Ok"
+#~ msgstr "Aceptar"
 
-msgid "Open calendar"
-msgstr "Abrir axenda"
+#~ msgid ""
+#~ "It is %s.  The Unix time is %ld right now.  We just thought you may like "
+#~ "to know."
+#~ msgstr ""
+#~ "Son as %s. O tempo Unix � agora %ld. Pensamos que lle gostar�a sabelo."
 
-msgid "Save calendar"
-msgstr "Gardar axenda"
+#~ msgid "%d"
+#~ msgstr "%d"
 
-msgid "Transparent"
-msgstr "Transparente"
+#~ msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
+#~ msgstr "A prioridade ten que ser 'Alta', 'Normal', 'Baixa' ou 'Indefinida'."
 
-msgid "Opaque"
-msgstr "Opaco"
+#~ msgid "FIXME: mail alarm options"
+#~ msgstr "AM��AME: opci�ns de alarma de correo"
 
-msgid ""
-"The classification must be 'Public', 'Private', 'Confidential' or 'None'"
-msgstr ""
-"A clasificaci�n ten que ser 'P�blica', 'Privada', 'Confidencial' ou "
-"'Ningunha'"
+#~ msgid "before start of appointment"
+#~ msgstr "antes do comezo da cita"
 
-msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
-msgstr "A transparencia ten que ser 'Transparente, 'Opaca' ou 'Ningunha'."
+#~ msgid "after start of appointment"
+#~ msgstr "despois do comezo da cita"
 
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr "<b>Erro cargando a axenda:<br>M�todo non soportado"
+#~ msgid "before end of appointment"
+#~ msgstr "antes da fin da cita"
 
-msgid "Alarms timeout after"
-msgstr "As alarmas saltan despois de"
+#~ msgid "I couldn't update your calendar file!\n"
+#~ msgstr "�Non foi posible actualizar o ficheiro da axenda!\n"
 
-msgid "Beep when alarm windows appear."
-msgstr "Chifrar cando aparece a fiestra de alarma."
+#~ msgid "Calendar attachment"
+#~ msgstr "Calendario anexo"
 
-msgid "Calendar Preferences"
-msgstr "Preferencias da Axenda"
+#~ msgid "No plaintext to sign."
+#~ msgstr "Non hai texto plano para asinar."
 
-msgid "Date navigator options"
-msgstr "Opci�ns do navegador de datas"
+#~ msgid "No password provided."
+#~ msgstr "Non se indicou un contrasinal."
 
-msgid "Defaults"
-msgstr "Opci�ns por defecto"
+#~ msgid "No plaintext to clearsign."
+#~ msgstr "Non hai texto plano para asinar en claro."
 
-msgid "Enable snoozing for"
-msgstr "Activa-lo adiamento para"
+#~ msgid "No plaintext to verify."
+#~ msgstr "Non hai texto plano para verificar."
 
-msgid "Highlight"
-msgstr "Resaltar"
+#~ msgid "No plaintext to encrypt."
+#~ msgstr "Non hai texto plano para cifrar."
 
-msgid "Items Due Today"
-msgstr "Elementos Para Hoxe"
+#~ msgid "No recipients specified"
+#~ msgstr "Non se especificaron destinatarios."
 
-msgid "Items Not Yet Due"
-msgstr "Elementos que A�nda Non Vencen"
+#~ msgid "No ciphertext to decrypt."
+#~ msgstr "Non hai texto cifrado para descifrar."
 
-msgid "Items Not Yet Due:"
-msgstr "Elementos que A�nda Non Vencen:"
+#~ msgid "Cannot summarize folder: %s: %s"
+#~ msgstr "Non � posible resumir o cartafol: %s: %s"
 
-msgid "Overdue Items"
-msgstr "Elementos Retrasados"
+#~ msgid "Synchronising folder"
+#~ msgstr "Sincronizando cartafol"
 
-msgid "Remind me of all appointments"
-msgstr "Lembrarme todas as citas"
+#~ msgid "Could not open folder to summarize: %s: %s"
+#~ msgstr "Non foi posible abrir o cartafol para o resumir: %s: %s"
 
-msgid "Time Until Due"
-msgstr "Tempo Ata o L�mite"
+#~ msgid "Could not open folder to summarise: %s: %s"
+#~ msgstr "Non foi posible abrir o cartafol para o resume: %s: %s"
 
-msgid "Visual Alarms"
-msgstr "Alarmas Visuais"
+#~ msgid "%d/%m/%Y"
+#~ msgstr "%d/%m/%Y"
 
-msgid "Work week"
-msgstr "Semana laboral"
+#~ msgid "%Y/%m/%d"
+#~ msgstr "%Y/%m/%d"
 
-msgid "minutes before they occur."
-msgstr "minutos antes de que ocorran."
+#~ msgid "%x"
+#~ msgstr "%x"
 
-msgid "Edit Task"
-msgstr "Editar Tarefa"
+#~ msgid "Elm mail"
+#~ msgstr "Correo de Elm"
 
-msgid "Task"
-msgstr "Tarefa"
+#~ msgid "Pine mail"
+#~ msgstr "Correo de Pine"
 
-msgid "Percent complete"
-msgstr "Porcentaxe completada"
+#~ msgid "Factory for the Evolution mail component."
+#~ msgstr "F�brica para o compo�ente de correo de Evolution."
 
-msgid "Transparency"
-msgstr "Transparencia"
+#~ msgid "Forwarded message:\n"
+#~ msgstr "Mensaxe remitida:\n"
 
-msgid "Mark the task complete"
-msgstr "Marcar a tarefa como completa"
+#~ msgid "Each account must have a different name."
+#~ msgstr "Cada conta ten que ter un nome diferente."
 
-msgid "Edit this task..."
-msgstr "Editar esta tarefa..."
+#~ msgid "Message _preview should be displayed by default"
+#~ msgstr "Debe amosarse a _previsualizaci�n da mensaxe por defecto"
 
-msgid "Edit the task"
-msgstr "Editar Tarefa"
+#~ msgid "Message list should display in a _threaded fashion by default"
+#~ msgstr "A lista de mensaxes debe amosarse en modo _f�o por defecto"
 
-msgid "Component successfully updated."
-msgstr "Compo�ente actualizado con �xito."
+#~ msgid "_Remember PGP Passphrase until exit"
+#~ msgstr "_Lembrar o contrasinal PGP ata sa�r"
 
-msgid "I couldn't open your calendar file!\n"
-msgstr "�Non foi posible abir o ficheiro da axenda!\n"
+#~ msgid "No such folder /%s"
+#~ msgstr "Non existe o cartafol /%s"
 
-msgid "I couldn't load your calendar file!\n"
-msgstr "�Non foi posible cargar o ficheiro da axenda!\n"
+#~ msgid "Registering '%s'"
+#~ msgstr "Rexistrando '%s'"
 
-msgid "This is a reply from someone who was uninvited!"
-msgstr "�Esta � unha resposta de algu�n que non foi convidado!"
+#~ msgid "Synchronizing '%s'"
+#~ msgstr "Sincronizando '%s'"
 
-msgid "I couldn't update your calendar store."
-msgstr "�Non foi posible actualizar o almacenamento da axenda!"
+#~ msgid "Factory for the Evolution executive summary component."
+#~ msgstr "F�brica para o compo�ente de Resume Executivo de Evolution."
 
-msgid "I couldn't delete the calendar component!\n"
-msgstr "�Non se puido borrar o compo�ente da axenda!\n"
+#~ msgid "%l:%M%p"
+#~ msgstr "%l:%M%p"
 
-msgid "Component successfully deleted."
-msgstr "Compo�ente borrado con �xito."
+#~ msgid "%a %l:%M%p"
+#~ msgstr "%a %k:%M"
 
-msgid "I don't recognize this type of calendar component."
-msgstr "Non se reco�ece este tipo de compo�ente de axenda."
+#~ msgid "There was an error downloading news feed"
+#~ msgstr "Houbo un erro ao descarga-la fonte de novas"
 
-msgid "Add to Calendar"
-msgstr "Engadir � Axenda"
+#~ msgid "_Refresh time (seconds):"
+#~ msgstr "Tempo de _refresco (segundos):"
 
-msgid " Tentative "
-msgstr " Tentativa "
+#~ msgid "Delete folder '%s'"
+#~ msgstr "Elimina-lo cartafol '%s'"
 
-msgid "Update Calendar"
-msgstr "Actualizar Axenda"
+#~ msgid "Rename"
+#~ msgstr "Renomear"
 
-msgid "Attendee address"
-msgstr "Enderezo do asistente"
+#~ msgid "_Debug"
+#~ msgstr "_Depuraci�n"
 
-msgid "Attendees: "
-msgstr "Asistentes: "
+#~ msgid "_Import File..."
+#~ msgstr "_Importar Ficheiro..."
 
-msgid "Organizer: "
-msgstr "Organizador: "
+#~ msgid "All Attendees"
+#~ msgstr "T�dolos Asistentes"
 
-msgid ""
-"Publish\n"
-"Event"
-msgstr ""
-"Publicar\n"
-"Evento"
+#~ msgid "Spool stores do not have an inbox"
+#~ msgstr "Os armacenamentos de spools non te�en un inbox"
 
-msgid "All"
-msgstr "Todas"
+#~ msgid "Standard Unix mailbox file"
+#~ msgstr "Ficheiro mailbox est�ndar de Unix"
 
-msgid "Show a dialog"
-msgstr "Amosar un di�logo"
+#~ msgid "Unix mbox spool-format mail files"
+#~ msgstr "Ficheiros de correo con formato de spool mbox de Unix"
 
-msgid "Appointment Basics"
-msgstr "B�sicos sobre Citas"
+#~ msgid ""
+#~ "For connecting to POP servers. The POP protocol can also be used to "
+#~ "retrieve mail from certain web mail providers and proprietary email "
+#~ "systems."
+#~ msgstr ""
+#~ "Para conectarse a servidores POP. O protocolo POP tam�n se pode usar para "
+#~ "recibir correo de certos provedores de correo web e sistemas de email "
+#~ "propietarios."
 
-msgid "Has category"
-msgstr "Ten a categor�a"
+#~ msgid "???"
+#~ msgstr "???"
 
-msgid "Could not test lock file for %s: %s"
-msgstr "Non foi posible comprobar o ficheiro de bloqueo para %s: %s"
+#~ msgid "C_ontacts..."
+#~ msgstr "C_ontactos..."
 
-msgid "%s is not a selectable folder"
-msgstr "O cartafol %s non � seleccionable"
+#~ msgid "_Company:"
+#~ msgstr "_Compa��a:"
 
-msgid "Send as:"
-msgstr "Enviar como:"
+#~ msgid "USA"
+#~ msgstr "Estados Unidos"
 
-msgid ""
-"Could not open signature file %s:\n"
-"%s"
-msgstr ""
-"Non foi posible abrir o ficheiro de sinatura %s:\n"
-"%s"
+#~ msgid "As _Minicards"
+#~ msgstr "Como _Minitarxetas"
 
-msgid "That is not a regular file."
-msgstr "Ese non � un ficheiro normal."
+#~ msgid "As _Table"
+#~ msgstr "Como unha _T�boa"
 
-msgid "That file exists but is not readable."
-msgstr "O ficheiro existe pero non se pode ler."
+#~ msgid ""
+#~ "We were unable to open this addressbook.  This either\n"
+#~ "means you have entered an incorrect URI, or have tried\n"
+#~ "to access an LDAP server and don't have LDAP support\n"
+#~ "compiled in.  If you've entered a URI, check the URI for\n"
+#~ "correctness and reenter.  If not, you probably have\n"
+#~ "attempted to access an LDAP server.  If you wish to be\n"
+#~ "able to use LDAP, you'll need to download and install\n"
+#~ "OpenLDAP and recompile and install Evolution.\n"
+#~ msgstr ""
+#~ "Non foi posible abrir este libro de enderezos. Isto\n"
+#~ "significa que introduciu un URI incorrecto, ou que se\n"
+#~ "tentou acceder a un servidor LDAP e o programa non\n"
+#~ "est� compilado con soporte LDAP. Se introduciu un URI\n"
+#~ "comprobe que sexa correcto e volva introducilo.\n"
+#~ "Sen�n, probablemente tentou acceder a un servidor LDAP.\n"
+#~ "Se desexa poder usar LDAP, necesitar� baixar e\n"
+#~ "instalar OpenLDAP e recompilar e instalar Evolution.\n"
 
-msgid "That file appeared accesible but open(2) failed."
-msgstr "O ficheiro parec�a accesible pero a chamada a open(2) fallou."
+#~ msgid "Unknown addressbook type"
+#~ msgstr "Tipo de libro de enderezos desco�ecido"
 
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
-msgstr ""
-"O ficheiro � moi longo (m�is de 100K).\n"
-"�Est� seguro de querer inserilo?"
+#~ msgid "None (anonymous mode)"
+#~ msgstr "Ning�n (modo an�nimo)"
 
-msgid "%I:%M:%S %p%n"
-msgstr "%I:%M:%S %p%n"
+#~ msgid "SASL"
+#~ msgstr "SASL"
 
-msgid "%H:%M:%S%n"
-msgstr "%H:%M:%S%n"
+#~ msgid "Unknown auth type"
+#~ msgstr "Tipo de autenticaci�n desco�ecido"
 
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
+#~ msgid "Subtree"
+#~ msgstr "Sub�rbore"
 
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
+#~ msgid "Unknown scope type"
+#~ msgstr "Tipo de �mbito desco�ecido"
 
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Non foi posible abrir o ficheiro HTML:\n"
-"%s"
+#~ msgid "Bind DN:"
+#~ msgstr "Asignar DN:"
 
-msgid "File does not have a place for the services.\n"
-msgstr "O ficheiro non ten un lugar para os servicios.\n"
+#~ msgid "FIXME Bind DN Help text here"
+#~ msgstr "AM��AME Texto de axuda para Asignar DN aqu�"
 
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-"Pode seleccionar unha p�xina HTML diferente para o fondo do Resumo "
-"Executivo.\n"
-"\n"
-"D�ixeo en branco para que apareza a asignada por defecto"
+#~ msgid "FIXME Host help text here."
+#~ msgstr "AM��AME Texto de axuda para Servidor aqu�"
 
-msgid "Open %s with the default GNOME application"
-msgstr "Abrir %s coa aplicaci�n por defecto de GNOME"
+#~ msgid "FIXME Port help text here."
+#~ msgstr "AM��AME Texto de axuda para Porto aqu�"
 
-msgid "Open %s with the default GNOME web browser"
-msgstr "Abrir %s co navegador web por defecto de GNOME"
+#~ msgid "Root DN:"
+#~ msgstr "DN Ra�z:"
 
-msgid "Send an email to %s"
-msgstr "Enviar unha mensaxe a %s"
+#~ msgid "FIXME Root DN help text here."
+#~ msgstr "AM��AME Texto de axuda para DN Ra�z aqu�"
 
-msgid "Run %s"
-msgstr "Executar %s"
+#~ msgid "Authentication:"
+#~ msgstr "Autenticaci�n:"
 
-msgid "Close %s"
-msgstr "Pechar %s"
+#~ msgid "FIXME Path Help text here"
+#~ msgstr "AM��AME Texto de axuda para Ruta aqu�"
 
-msgid "Move %s to the left"
-msgstr "Mover %s para a esquerda"
+#~ msgid "Create path if it doesn't exist."
+#~ msgstr "Crear ruta se non existe."
 
-msgid "Move %s to the right"
-msgstr "Mover %s para a dereita"
+#~ msgid ""
+#~ "Select the kind of addressbook you have, and enter the relevant "
+#~ "information about it."
+#~ msgstr ""
+#~ "Escolla a clase de Libro de Enderezos que ten, e introduza a informaci�n "
+#~ "relevante sobre el."
 
-msgid "Move %s into the previous row"
-msgstr "Mover %s � fileira anterior"
+#~ msgid "FIXME Name help text here"
+#~ msgstr "AM��AME Texto de axuda para Nome aqu�"
 
-msgid "Move %s into the next row"
-msgstr "Mover %s � seguinte fileira"
+#~ msgid "FIXME Description help text here"
+#~ msgstr "AM��AME Texto de axuda para Descrici�n aqu�"
 
-msgid "Background:"
-msgstr "Fondo:"
+#~ msgid "Edit"
+#~ msgstr "Editar"
 
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-"O compo�ente Resumo Executivo non puido inicializar Bonobo.\n"
-"Se hai unha mensaxe de advertencia sobre RootPOA, probablemente\n"
-"significa que compilou Bonobo contra GOAD no canto de OAF."
+#~ msgid "URI"
+#~ msgstr "URI"
 
-msgid "Factory for the RDF summary."
-msgstr "F�brica para o resumo RDF."
+#~ msgid "Find..."
+#~ msgstr "Buscar..."
 
-msgid "RDF Summary"
-msgstr "Resume RDF"
+#~ msgid "Select name from:"
+#~ msgstr "Seleccionar nome dende:"
 
-msgid "Factory for the test bonobo component."
-msgstr "F�brica para o compo�ente bonobo de probas."
+#~ msgid "Open calendar"
+#~ msgstr "Abrir axenda"
 
-msgid "Factory for the test component."
-msgstr "F�brica para o compo�ente de probas."
+#~ msgid "Save calendar"
+#~ msgstr "Gardar axenda"
 
-msgid "Test bonobo service"
-msgstr "Comprobar servicio bonobo"
+#~ msgid "Transparent"
+#~ msgstr "Transparente"
 
-msgid "Test service"
-msgstr "Comprobar servicio"
+#~ msgid "Opaque"
+#~ msgstr "Opaco"
 
-msgid "Update automatically"
-msgstr "Actualizar automaticamente"
+#~ msgid ""
+#~ "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
+#~ msgstr ""
+#~ "A clasificaci�n ten que ser 'P�blica', 'Privada', 'Confidencial' ou "
+#~ "'Ningunha'"
 
-msgid "Forward to Address"
-msgstr "Reenviar � Enderezo"
+#~ msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
+#~ msgstr "A transparencia ten que ser 'Transparente, 'Opaca' ou 'Ningunha'."
 
-msgid "Store search as vFolder"
-msgstr "Armacenar busca como CartafolV"
+#~ msgid "<b>Error loading calendar:<br>Method not supported"
+#~ msgstr "<b>Erro cargando a axenda:<br>M�todo non soportado"
 
-msgid "Resend"
-msgstr "Re-enviar"
+#~ msgid "Alarms timeout after"
+#~ msgstr "As alarmas saltan despois de"
 
-msgid "Evolution Account Manager"
-msgstr "Xestor de Contas de Evolution"
+#~ msgid "Beep when alarm windows appear."
+#~ msgstr "Chifrar cando aparece a fiestra de alarma."
 
-msgid "On %s, %s wrote:"
-msgstr "O %s, %s escribiu:"
+#~ msgid "Calendar Preferences"
+#~ msgstr "Preferencias da Axenda"
 
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr "Cambiar o cartafol \"%s\" � formato \"%s\""
+#~ msgid "Date navigator options"
+#~ msgstr "Opci�ns do navegador de datas"
 
-msgid "Closing current folder"
-msgstr "Pechando o cartafol actual"
+#~ msgid "Defaults"
+#~ msgstr "Opci�ns por defecto"
 
-msgid "Renaming old folder and opening"
-msgstr "Renomeando o cartafol antigo e abrindo"
+#~ msgid "Enable snoozing for"
+#~ msgstr "Activa-lo adiamento para"
 
-msgid "Copying messages"
-msgstr "Copiando as mensaxes"
+#~ msgid "Highlight"
+#~ msgstr "Resaltar"
 
-msgid "Do you accept?"
-msgstr "�Acepta?"
+#~ msgid "Items Due Today"
+#~ msgstr "Elementos Para Hoxe"
 
-msgid "Evolution progress"
-msgstr "Progreso de Evolution"
+#~ msgid "Items Not Yet Due"
+#~ msgstr "Elementos que A�nda Non Vencen"
 
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Recibindo a mensaxe n�mero %d de %d (uid \"%s\")"
+#~ msgid "Items Not Yet Due:"
+#~ msgstr "Elementos que A�nda Non Vencen:"
 
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "Gardando a mensaxe %d de %d (uid \"%s\")"
+#~ msgid "Overdue Items"
+#~ msgstr "Elementos Retrasados"
 
-msgid "Receiving"
-msgstr "Recibindo"
+#~ msgid "Remind me of all appointments"
+#~ msgstr "Lembrarme todas as citas"
 
-msgid "Incomplete message written on pipe!"
-msgstr "�Mensaxe incompleta escrita na canalizaci�n!"
+#~ msgid "Time Until Due"
+#~ msgstr "Tempo Ata o L�mite"
 
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (mensaxe remitida)"
+#~ msgid "Visual Alarms"
+#~ msgstr "Alarmas Visuais"
 
-msgid "Forwarded message (no subject)"
-msgstr "Mensaxe remitida (sen asunto)"
+#~ msgid "Work week"
+#~ msgstr "Semana laboral"
 
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> %"
-"s<br><b>Subject:</b> %s<br>"
-msgstr ""
-"-----Mensaxe Remitida-----<br><b>De:</b> %s<br><b>Para:</b> %s<br><b>Asunto:"
-"</b> %s<br>"
+#~ msgid "minutes before they occur."
+#~ msgstr "minutos antes de que ocorran."
 
-msgid "Print the selected message"
-msgstr "Imprimir a mensaxe seleccionada"
+#~ msgid "Edit Task"
+#~ msgstr "Editar Tarefa"
 
-msgid "Delete this message"
-msgstr "Borrar esta mensaxe"
+#~ msgid "Task"
+#~ msgstr "Tarefa"
 
-msgid "Getting store for \"%s\""
-msgstr "Conseguindo armacenamento para \"%s\""
+#~ msgid "Percent complete"
+#~ msgstr "Porcentaxe completada"
 
-msgid "Evolution files successfully installed."
-msgstr "Ficheiros de Evolution instalados con �xito."
+#~ msgid "Transparency"
+#~ msgstr "Transparencia"
 
-msgid "This seems to be the first time you are running Evolution."
-msgstr "Semella que � a primeira vez que executa Evolution."
+#~ msgid "Mark the task complete"
+#~ msgstr "Marcar a tarefa como completa"
 
-msgid "Please click \"OK\" to install the Evolution user files under"
-msgstr ""
-"Prema \"Aceptar\" para instalar os ficheiros de usuario de Evolution en"
+#~ msgid "Edit this task..."
+#~ msgstr "Editar esta tarefa..."
 
-msgid "Activate"
-msgstr "Activar"
+#~ msgid "Edit the task"
+#~ msgstr "Editar Tarefa"
 
-msgid "Activate this shortcut"
-msgstr "Activar este atallo"
+#~ msgid "Component successfully updated."
+#~ msgstr "Compo�ente actualizado con �xito."
 
-msgid "Find a contact"
-msgstr "Buscar un contacto"
+#~ msgid "I couldn't open your calendar file!\n"
+#~ msgstr "�Non foi posible abir o ficheiro da axenda!\n"
 
-msgid "View All"
-msgstr "Ver Todos"
+#~ msgid "I couldn't load your calendar file!\n"
+#~ msgstr "�Non foi posible cargar o ficheiro da axenda!\n"
 
-msgid "View all contacts"
-msgstr "Ver t�dolos contactos"
+#~ msgid "This is a reply from someone who was uninvited!"
+#~ msgstr "�Esta � unha resposta de algu�n que non foi convidado!"
 
-msgid "5 Days"
-msgstr "5 D�as"
+#~ msgid "I couldn't update your calendar store."
+#~ msgstr "�Non foi posible actualizar o almacenamento da axenda!"
 
-msgid "Alter preferences"
-msgstr "Modifica-las preferencias"
+#~ msgid "I couldn't delete the calendar component!\n"
+#~ msgstr "�Non se puido borrar o compo�ente da axenda!\n"
 
-msgid "Create a new calendar"
-msgstr "Crear unha nova axenda"
+#~ msgid "Component successfully deleted."
+#~ msgstr "Compo�ente borrado con �xito."
 
-msgid "Go to present time"
-msgstr "Ir � hora actual"
+#~ msgid "I don't recognize this type of calendar component."
+#~ msgstr "Non se reco�ece este tipo de compo�ente de axenda."
 
-msgid "New _Event"
-msgstr "Novo _Evento"
+#~ msgid "Add to Calendar"
+#~ msgstr "Engadir � Axenda"
 
-msgid "Prev"
-msgstr "Ant"
+#~ msgid " Tentative "
+#~ msgstr " Tentativa "
 
-msgid "Save calendar as something else"
-msgstr "Gardar axenda como outra cousa distinta"
+#~ msgid "Update Calendar"
+#~ msgstr "Actualizar Axenda"
 
-msgid "_Day"
-msgstr "_D�a"
+#~ msgid "Attendees: "
+#~ msgstr "Asistentes: "
 
-msgid "_Month"
-msgstr "_Mes"
+#~ msgid "Organizer: "
+#~ msgstr "Organizador: "
 
-msgid "_Open Calendar"
-msgstr "_Abrir Axenda"
+#~ msgid ""
+#~ "Publish\n"
+#~ "Event"
+#~ msgstr ""
+#~ "Publicar\n"
+#~ "Evento"
 
-msgid "Help"
-msgstr "Axuda"
+#~ msgid "All"
+#~ msgstr "Todas"
 
-msgid "See online help"
-msgstr "Ver a axuda online"
+#~ msgid "Show a dialog"
+#~ msgstr "Amosar un di�logo"
 
-msgid "About this application"
-msgstr "Acerca desta aplicaci�n"
+#~ msgid "Appointment Basics"
+#~ msgstr "B�sicos sobre Citas"
 
-msgid "About..."
-msgstr "Acerca de..."
+#~ msgid "Has category"
+#~ msgstr "Ten a categor�a"
 
-msgid "Actio_ns"
-msgstr "Acci�_ns"
+#~ msgid "Could not test lock file for %s: %s"
+#~ msgstr "Non foi posible comprobar o ficheiro de bloqueo para %s: %s"
 
-msgid "Address _Book... (FIXME)"
-msgstr "_Libro de Enderezos... (AM��AME)"
+#~ msgid "%s is not a selectable folder"
+#~ msgstr "O cartafol %s non � seleccionable"
 
-msgid "C_lear"
-msgstr "_Limpar"
+#~ msgid "Send as:"
+#~ msgstr "Enviar como:"
 
-msgid "Chec_k Names (FIXME)"
-msgstr "Comproba_r Nomes (AM��AME)"
+#~ msgid "That is not a regular file."
+#~ msgstr "Ese non � un ficheiro normal."
 
-msgid "Close this appointment"
-msgstr "Pechar esta cita"
+#~ msgid "That file exists but is not readable."
+#~ msgstr "O ficheiro existe pero non se pode ler."
 
-msgid "Cop_y to Folder... (FIXME)"
-msgstr "Cop_iar ao Cartafol... (AM��AME)"
+#~ msgid "That file appeared accesible but open(2) failed."
+#~ msgstr "O ficheiro parec�a accesible pero a chamada a open(2) fallou."
 
-msgid "Dump XML"
-msgstr "Envorcar XML"
+#~ msgid ""
+#~ "The file is very large (more than 100K).\n"
+#~ "Are you sure you wish to insert it?"
+#~ msgstr ""
+#~ "O ficheiro � moi longo (m�is de 100K).\n"
+#~ "�Est� seguro de querer inserilo?"
 
-msgid "Dump the UI Xml description"
-msgstr "Envorcar a descrici�n Xml da Interface"
+#~ msgid "%I:%M:%S %p%n"
+#~ msgstr "%I:%M:%S %p%n"
 
-msgid "Fi_rst Item in Folder (FIXME)"
-msgstr "P_rimeiro Obxecto no Cartafol (AM��AME)"
+#~ msgid "%H:%M:%S%n"
+#~ msgstr "%H:%M:%S%n"
 
-msgid "For_ward (FIXME)"
-msgstr "Re_mitir (AM��AME)"
+#~ msgid "%I:%M %p%n"
+#~ msgstr "%I:%M %p%n"
 
-msgid "Go to the next item"
-msgstr "Ir � elemento seguinte"
+#~ msgid "%H:%M%n"
+#~ msgstr "%H:%M%n"
 
-msgid "Go to the previous item"
-msgstr "Ir � elemento anterior"
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Non foi posible abrir o ficheiro HTML:\n"
+#~ "%s"
 
-msgid "In_complete Task (FIXME)"
-msgstr "Tarefa In_completa (AM��AME)"
+#~ msgid "File does not have a place for the services.\n"
+#~ msgstr "O ficheiro non ten un lugar para os servicios.\n"
 
-msgid "N_ext"
-msgstr "Se_guinte"
+#~ msgid ""
+#~ "You can select a different HTML page for the background of the Executive "
+#~ "Summary.\n"
+#~ "\n"
+#~ "Just leave it blank for the default"
+#~ msgstr ""
+#~ "Pode seleccionar unha p�xina HTML diferente para o fondo do Resumo "
+#~ "Executivo.\n"
+#~ "\n"
+#~ "D�ixeo en branco para que apareza a asignada por defecto"
 
-msgid "Pre_vious"
-msgstr "An_terior"
+#~ msgid "Open %s with the default GNOME application"
+#~ msgstr "Abrir %s coa aplicaci�n por defecto de GNOME"
 
-msgid "Print S_etup..."
-msgstr "_Configuraci�n da Impresi�n..."
+#~ msgid "Open %s with the default GNOME web browser"
+#~ msgstr "Abrir %s co navegador web por defecto de GNOME"
 
-msgid "Save the appointment and close the dialog box"
-msgstr "Gardar a cita e pechar a caixa de di�logo"
+#~ msgid "Send an email to %s"
+#~ msgstr "Enviar unha mensaxe a %s"
 
-msgid "Schedule some sort of a meeting"
-msgstr "Programar algunha clase de reuni�n"
+#~ msgid "Run %s"
+#~ msgstr "Executar %s"
 
-msgid "Select everything"
-msgstr "Seleccionar todo"
+#~ msgid "Close %s"
+#~ msgstr "Pechar %s"
 
-msgid "_About..."
-msgstr "_Acerca de..."
+#~ msgid "Move %s to the left"
+#~ msgstr "Mover %s para a esquerda"
 
-msgid "_Contact (FIXME)"
-msgstr "_Contacto (AM��AME)"
+#~ msgid "Move %s to the right"
+#~ msgstr "Mover %s para a dereita"
 
-msgid "_Item (FIXME)"
-msgstr "_Elemento (AM��AME)"
+#~ msgid "Move %s into the previous row"
+#~ msgstr "Mover %s � fileira anterior"
 
-msgid "_Journal Entry (FIXME)"
-msgstr "_Entrada de Diario (AM��AME)"
+#~ msgid "Move %s into the next row"
+#~ msgstr "Mover %s � seguinte fileira"
 
-msgid "_Last Item in Folder (FIXME)"
-msgstr "_Derradeiro Elemento do Cartafol (AM��AME)"
+#~ msgid "Background:"
+#~ msgstr "Fondo:"
 
-msgid "_Mail Message (FIXME)"
-msgstr "Enviar _Mensaxe (AM��AME)"
+#~ msgid ""
+#~ "Executive summary component could not initialize Bonobo.\n"
+#~ "If there was a warning message about the RootPOA, it probably means\n"
+#~ "you compiled Bonobo against GOAD instead of OAF."
+#~ msgstr ""
+#~ "O compo�ente Resumo Executivo non puido inicializar Bonobo.\n"
+#~ "Se hai unha mensaxe de advertencia sobre RootPOA, probablemente\n"
+#~ "significa que compilou Bonobo contra GOAD no canto de OAF."
 
-msgid "_Move to Folder... (FIXME)"
-msgstr "_Mover ao Cartafol ... (AM��AME)"
+#~ msgid "Factory for the RDF summary."
+#~ msgstr "F�brica para o resumo RDF."
 
-msgid "_Note (FIXME)"
-msgstr "_Nota (AM��AME)"
+#~ msgid "RDF Summary"
+#~ msgstr "Resume RDF"
 
-msgid "_Task (FIXME)"
-msgstr "_Tarefa (AM��AME)"
+#~ msgid "Factory for the test bonobo component."
+#~ msgstr "F�brica para o compo�ente bonobo de probas."
 
-msgid "_Unread Item (FIXME)"
-msgstr "_Obxecto non Lido (AM��AME)"
+#~ msgid "Factory for the test component."
+#~ msgstr "F�brica para o compo�ente de probas."
 
-msgid "Add Service"
-msgstr "Engadir Servicio"
+#~ msgid "Test bonobo service"
+#~ msgstr "Comprobar servicio bonobo"
 
-msgid "Add a new service to the Executive Summary"
-msgstr "Engadir un novo servicio ao Resumo Executivo"
+#~ msgid "Test service"
+#~ msgstr "Comprobar servicio"
 
-msgid "Create a new email"
-msgstr "Crear unha nova mensaxe"
+#~ msgid "Update automatically"
+#~ msgstr "Actualizar automaticamente"
 
-msgid "Apply any new filters to the mail in this box"
-msgstr "Aplicar calquera filtro novo ao correo desta caixa"
+#~ msgid "Forward to Address"
+#~ msgstr "Reenviar � Enderezo"
 
-msgid "Configure Folder..."
-msgstr "_Configurar Cartafol..."
+#~ msgid "Store search as vFolder"
+#~ msgstr "Armacenar busca como CartafolV"
 
-msgid "Copy message to a new folder"
-msgstr "Copiar a mensaxe a un novo cartafol"
+#~ msgid "Resend"
+#~ msgstr "Re-enviar"
 
-msgid "Display all of the message headers"
-msgstr "Amosar todas as cabeceiras da mensaxe"
+#~ msgid "Evolution Account Manager"
+#~ msgstr "Xestor de Contas de Evolution"
 
-msgid "Expunge"
-msgstr "Limpar"
+#~ msgid "On %s, %s wrote:"
+#~ msgstr "O %s, %s escribiu:"
 
-msgid "Finaly remove all mails tagged for deletion"
-msgstr "Eliminar definitivamente todas as mensaxes etiquetadas para borrar"
+#~ msgid "Change folder \"%s\" to \"%s\" format"
+#~ msgstr "Cambiar o cartafol \"%s\" � formato \"%s\""
 
-msgid "Forward inline"
-msgstr "Remitir inline"
+#~ msgid "Closing current folder"
+#~ msgstr "Pechando o cartafol actual"
 
-msgid "Forward this message in-line with your mail, so you can edit it"
-msgstr "Remitir esta mensaxe in-line coa s�a, para poder editala"
+#~ msgid "Renaming old folder and opening"
+#~ msgstr "Renomeando o cartafol antigo e abrindo"
 
-msgid "Invert Selection"
-msgstr "Inverter Selecci�n"
+#~ msgid "Do you accept?"
+#~ msgstr "�Acepta?"
 
-msgid "Manage _Subscriptions..."
-msgstr "Xestionar _Subscripci�ns"
+#~ msgid "Evolution progress"
+#~ msgstr "Progreso de Evolution"
 
-msgid "Mark As Read"
-msgstr "Marcar como Lida"
+#~ msgid "Retrieving message number %d of %d (uid \"%s\")"
+#~ msgstr "Recibindo a mensaxe n�mero %d de %d (uid \"%s\")"
 
-msgid "Mark As U_nread"
-msgstr "Marcar como _Non Lida"
+#~ msgid "Saving message %d of %d (uid \"%s\")"
+#~ msgstr "Gardando a mensaxe %d de %d (uid \"%s\")"
 
-msgid "Move message to a new folder"
-msgstr "Mover mensaxe a un novo cartafol"
+#~ msgid "Receiving"
+#~ msgstr "Recibindo"
 
-msgid "Print Preview of message..."
-msgstr "Previsualizaci�n da Impresi�n da mensaxe..."
+#~ msgid "Incomplete message written on pipe!"
+#~ msgstr "�Mensaxe incompleta escrita na canalizaci�n!"
 
-msgid "Print message to the printer"
-msgstr "Imprimir mensaxe na impresora"
+#~ msgid "[%s] (forwarded message)"
+#~ msgstr "[%s] (mensaxe remitida)"
 
-msgid "Print message..."
-msgstr "Imprimir mensaxe..."
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "Mensaxe remitida (sen asunto)"
 
-msgid "Redirect (FIXME: implement me)"
-msgstr "Redireccionar (AM��AME: implem�ntame)"
+#~ msgid ""
+#~ "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> %"
+#~ "s<br><b>Subject:</b> %s<br>"
+#~ msgstr ""
+#~ "-----Mensaxe Remitida-----<br><b>De:</b> %s<br><b>Para:</b> %"
+#~ "s<br><b>Asunto:</b> %s<br>"
 
-msgid "Reply to all"
-msgstr "Responder a todos"
+#~ msgid "Print the selected message"
+#~ msgstr "Imprimir a mensaxe seleccionada"
 
-msgid "Reply to sender"
-msgstr "Responder � autor"
+#~ msgid "Delete this message"
+#~ msgstr "Borrar esta mensaxe"
 
-msgid "Send a reply to the person who sent you this mail"
-msgstr "Enviar unha resposta � persoa que enviou esta mensaxe"
+#~ msgid "Getting store for \"%s\""
+#~ msgstr "Conseguindo armacenamento para \"%s\""
 
-msgid "Send a single mail in reply to all the selected mail"
-msgstr "Enviar unha �nica mensaxe en resposta a todo o correo seleccionado"
+#~ msgid "Evolution files successfully installed."
+#~ msgstr "Ficheiros de Evolution instalados con �xito."
 
-msgid ""
-"Send queued mail\n"
-"    and retrieve new mail"
-msgstr ""
-"Enviar o correo na cola\n"
-"    e recibir o correo novo"
+#~ msgid "This seems to be the first time you are running Evolution."
+#~ msgstr "Semella que � a primeira vez que executa Evolution."
 
-msgid "Show _All"
-msgstr "Amosar _Todo"
+#~ msgid "Please click \"OK\" to install the Evolution user files under"
+#~ msgstr ""
+#~ "Prema \"Aceptar\" para instalar os ficheiros de usuario de Evolution en"
 
-msgid "View Raw Message Source"
-msgstr "Ver o C�digo Fonte sen Procesar da Mensaxe"
+#~ msgid "Activate"
+#~ msgstr "Activar"
 
-msgid "_Reply"
-msgstr "_Responder"
+#~ msgid "Activate this shortcut"
+#~ msgstr "Activar este atallo"
 
-msgid "_Save Message As..."
-msgstr "_Gardar Mensaxe Como..."
+#~ msgid "Find a contact"
+#~ msgstr "Buscar un contacto"
 
-msgid "_Threaded"
-msgstr "_Por f�os"
+#~ msgid "View All"
+#~ msgstr "Ver Todos"
 
-msgid "Save in _folder... (FIXME)"
-msgstr "Gardar no _cartafol... (AM��AME)"
+#~ msgid "View all contacts"
+#~ msgstr "Ver t�dolos contactos"
 
-msgid "Send the message now"
-msgstr "Enviar a mensaxe agora"
+#~ msgid "5 Days"
+#~ msgstr "5 D�as"
 
-msgid "_Insert text file... (FIXME)"
-msgstr "_Inserir ficheiro de texto... (AM��AME)"
+#~ msgid "Alter preferences"
+#~ msgstr "Modifica-las preferencias"
 
-msgid "Redo"
-msgstr "Refacer"
+#~ msgid "Create a new calendar"
+#~ msgstr "Crear unha nova axenda"
 
-msgid "Redo the undone action"
-msgstr "Refacer a acci�n desfeita"
+#~ msgid "Go to present time"
+#~ msgstr "Ir � hora actual"
 
-msgid "Replace"
-msgstr "Substitu�r"
+#~ msgid "New _Event"
+#~ msgstr "Novo _Evento"
 
-msgid "Replace a string"
-msgstr "Substitu�r unha cadea"
+#~ msgid "Prev"
+#~ msgstr "Ant"
 
-msgid "Reply to A_ll (FIXME)"
-msgstr "Responder a _Todos (AM��AME)"
+#~ msgid "Save calendar as something else"
+#~ msgstr "Gardar axenda como outra cousa distinta"
 
-msgid "S_end Status Report (FIXME)"
-msgstr "_Mandar Informe de Estado (AM��AME)"
+#~ msgid "_Day"
+#~ msgstr "_D�a"
 
-msgid "S_kip Occurrence (FIXME)"
-msgstr "S_altarse a Ocorrencia (AM��AME)"
+#~ msgid "_Month"
+#~ msgstr "_Mes"
 
-msgid "Search again for the same string"
-msgstr "Buscar novamente a mesma cadea"
+#~ msgid "_Open Calendar"
+#~ msgstr "_Abrir Axenda"
 
-msgid "Undo"
-msgstr "Desfacer"
+#~ msgid "Help"
+#~ msgstr "Axuda"
 
-msgid "Undo the last action"
-msgstr "Desfacer a �ltima acci�n"
+#~ msgid "See online help"
+#~ msgstr "Ver a axuda online"
 
-msgid "_Appointment (FIXME)"
-msgstr "_Cita (AM��AME)"
+#~ msgid "About this application"
+#~ msgstr "Acerca desta aplicaci�n"
 
-msgid "_Mark Complete (FIXME)"
-msgstr "_Marcar como Completa (AM��AME)"
+#~ msgid "About..."
+#~ msgstr "Acerca de..."
 
-msgid "_Reply (FIXME)"
-msgstr "_Responder (AM��AME)"
+#~ msgid "Actio_ns"
+#~ msgstr "Acci�_ns"
 
-msgid "Save task as something else"
-msgstr "Gardar a tarefa como outra cousa distinta"
+#~ msgid "Address _Book... (FIXME)"
+#~ msgstr "_Libro de Enderezos... (AM��AME)"
 
-msgid "Tasks Preferences..."
-msgstr "Preferencias das Tarefas..."
+#~ msgid "C_lear"
+#~ msgstr "_Limpar"
+
+#~ msgid "Chec_k Names (FIXME)"
+#~ msgstr "Comproba_r Nomes (AM��AME)"
+
+#~ msgid "Close this appointment"
+#~ msgstr "Pechar esta cita"
+
+#~ msgid "Cop_y to Folder... (FIXME)"
+#~ msgstr "Cop_iar ao Cartafol... (AM��AME)"
+
+#~ msgid "Dump XML"
+#~ msgstr "Envorcar XML"
+
+#~ msgid "Dump the UI Xml description"
+#~ msgstr "Envorcar a descrici�n Xml da Interface"
+
+#~ msgid "Fi_rst Item in Folder (FIXME)"
+#~ msgstr "P_rimeiro Obxecto no Cartafol (AM��AME)"
+
+#~ msgid "For_ward (FIXME)"
+#~ msgstr "Re_mitir (AM��AME)"
+
+#~ msgid "Go to the next item"
+#~ msgstr "Ir � elemento seguinte"
+
+#~ msgid "Go to the previous item"
+#~ msgstr "Ir � elemento anterior"
+
+#~ msgid "In_complete Task (FIXME)"
+#~ msgstr "Tarefa In_completa (AM��AME)"
+
+#~ msgid "N_ext"
+#~ msgstr "Se_guinte"
+
+#~ msgid "Pre_vious"
+#~ msgstr "An_terior"
+
+#~ msgid "Print S_etup..."
+#~ msgstr "_Configuraci�n da Impresi�n..."
+
+#~ msgid "Save the appointment and close the dialog box"
+#~ msgstr "Gardar a cita e pechar a caixa de di�logo"
+
+#~ msgid "Schedule some sort of a meeting"
+#~ msgstr "Programar algunha clase de reuni�n"
+
+#~ msgid "Select everything"
+#~ msgstr "Seleccionar todo"
+
+#~ msgid "_About..."
+#~ msgstr "_Acerca de..."
+
+#~ msgid "_Contact (FIXME)"
+#~ msgstr "_Contacto (AM��AME)"
+
+#~ msgid "_Item (FIXME)"
+#~ msgstr "_Elemento (AM��AME)"
+
+#~ msgid "_Journal Entry (FIXME)"
+#~ msgstr "_Entrada de Diario (AM��AME)"
+
+#~ msgid "_Last Item in Folder (FIXME)"
+#~ msgstr "_Derradeiro Elemento do Cartafol (AM��AME)"
+
+#~ msgid "_Mail Message (FIXME)"
+#~ msgstr "Enviar _Mensaxe (AM��AME)"
+
+#~ msgid "_Move to Folder... (FIXME)"
+#~ msgstr "_Mover ao Cartafol ... (AM��AME)"
+
+#~ msgid "_Note (FIXME)"
+#~ msgstr "_Nota (AM��AME)"
+
+#~ msgid "_Task (FIXME)"
+#~ msgstr "_Tarefa (AM��AME)"
+
+#~ msgid "_Unread Item (FIXME)"
+#~ msgstr "_Obxecto non Lido (AM��AME)"
+
+#~ msgid "Add Service"
+#~ msgstr "Engadir Servicio"
+
+#~ msgid "Add a new service to the Executive Summary"
+#~ msgstr "Engadir un novo servicio ao Resumo Executivo"
+
+#~ msgid "Create a new email"
+#~ msgstr "Crear unha nova mensaxe"
+
+#~ msgid "Apply any new filters to the mail in this box"
+#~ msgstr "Aplicar calquera filtro novo ao correo desta caixa"
+
+#~ msgid "Configure Folder..."
+#~ msgstr "_Configurar Cartafol..."
+
+#~ 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"
+
+#~ msgid "Expunge"
+#~ msgstr "Limpar"
+
+#~ msgid "Finaly remove all mails tagged for deletion"
+#~ msgstr "Eliminar definitivamente todas as mensaxes etiquetadas para borrar"
+
+#~ msgid "Forward inline"
+#~ msgstr "Remitir inline"
+
+#~ msgid "Forward this message in-line with your mail, so you can edit it"
+#~ msgstr "Remitir esta mensaxe in-line coa s�a, para poder editala"
+
+#~ msgid "Invert Selection"
+#~ msgstr "Inverter Selecci�n"
+
+#~ msgid "Manage _Subscriptions..."
+#~ msgstr "Xestionar _Subscripci�ns"
+
+#~ msgid "Mark As Read"
+#~ msgstr "Marcar como Lida"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "Marcar como _Non Lida"
+
+#~ msgid "Move message to a new folder"
+#~ msgstr "Mover mensaxe a un novo cartafol"
+
+#~ msgid "Print Preview of message..."
+#~ msgstr "Previsualizaci�n da Impresi�n da mensaxe..."
+
+#~ msgid "Print message to the printer"
+#~ msgstr "Imprimir mensaxe na impresora"
+
+#~ msgid "Print message..."
+#~ msgstr "Imprimir mensaxe..."
+
+#~ msgid "Redirect (FIXME: implement me)"
+#~ msgstr "Redireccionar (AM��AME: implem�ntame)"
+
+#~ msgid "Reply to all"
+#~ msgstr "Responder a todos"
+
+#~ msgid "Reply to sender"
+#~ msgstr "Responder � autor"
+
+#~ msgid "Send a reply to the person who sent you this mail"
+#~ msgstr "Enviar unha resposta � persoa que enviou esta mensaxe"
+
+#~ msgid "Send a single mail in reply to all the selected mail"
+#~ msgstr "Enviar unha �nica mensaxe en resposta a todo o correo seleccionado"
+
+#~ msgid ""
+#~ "Send queued mail\n"
+#~ "    and retrieve new mail"
+#~ msgstr ""
+#~ "Enviar o correo na cola\n"
+#~ "    e recibir o correo novo"
+
+#~ msgid "Show _All"
+#~ msgstr "Amosar _Todo"
+
+#~ msgid "View Raw Message Source"
+#~ msgstr "Ver o C�digo Fonte sen Procesar da Mensaxe"
+
+#~ msgid "_Reply"
+#~ msgstr "_Responder"
+
+#~ msgid "_Save Message As..."
+#~ msgstr "_Gardar Mensaxe Como..."
+
+#~ msgid "_Threaded"
+#~ msgstr "_Por f�os"
+
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "Gardar no _cartafol... (AM��AME)"
+
+#~ msgid "Send the message now"
+#~ msgstr "Enviar a mensaxe agora"
+
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "_Inserir ficheiro de texto... (AM��AME)"
+
+#~ msgid "Redo"
+#~ msgstr "Refacer"
+
+#~ msgid "Redo the undone action"
+#~ msgstr "Refacer a acci�n desfeita"
+
+#~ msgid "Replace"
+#~ msgstr "Substitu�r"
+
+#~ msgid "Replace a string"
+#~ msgstr "Substitu�r unha cadea"
+
+#~ msgid "Reply to A_ll (FIXME)"
+#~ msgstr "Responder a _Todos (AM��AME)"
+
+#~ msgid "S_end Status Report (FIXME)"
+#~ msgstr "_Mandar Informe de Estado (AM��AME)"
+
+#~ msgid "S_kip Occurrence (FIXME)"
+#~ msgstr "S_altarse a Ocorrencia (AM��AME)"
+
+#~ msgid "Search again for the same string"
+#~ msgstr "Buscar novamente a mesma cadea"
+
+#~ msgid "Undo"
+#~ msgstr "Desfacer"
+
+#~ msgid "Undo the last action"
+#~ msgstr "Desfacer a �ltima acci�n"
+
+#~ msgid "_Appointment (FIXME)"
+#~ msgstr "_Cita (AM��AME)"
+
+#~ msgid "_Mark Complete (FIXME)"
+#~ msgstr "_Marcar como Completa (AM��AME)"
+
+#~ msgid "_Reply (FIXME)"
+#~ msgstr "_Responder (AM��AME)"
+
+#~ 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..."
+#~ msgid "Customi_ze Toolbars..."
+#~ msgstr "Personali_zar Barras de Tarefas..."
 
-msgid "Customize"
-msgstr "Personalizar"
+#~ msgid "Customize"
+#~ msgstr "Personalizar"
 
-msgid "Customize toolbars"
-msgstr "Personaliza-las barras de tarefas"
+#~ msgid "Customize toolbars"
+#~ msgstr "Personaliza-las barras de tarefas"
 
-msgid "Evolution bar _shortcut"
-msgstr "_Atallo da barra de Evolution"
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "_Atallo da barra de Evolution"
 
-msgid "Getting _Started"
-msgstr "_Iniciaci�n"
+#~ msgid "Getting _Started"
+#~ msgstr "_Iniciaci�n"
 
-msgid "Using the C_ontact Manager"
-msgstr "Uso do Xestor de Co_ntactos"
+#~ msgid "Using the C_ontact Manager"
+#~ msgstr "Uso do Xestor de Co_ntactos"
 
-msgid "Using the _Calendar"
-msgstr "Uso da _Axenda"
+#~ msgid "Using the _Calendar"
+#~ msgstr "Uso da _Axenda"
 
-msgid "Using the _Mailer"
-msgstr "Uso do Cliente de _Correo"
+#~ msgid "Using the _Mailer"
+#~ msgstr "Uso do Cliente de _Correo"
 
-msgid "_Index"
-msgstr "�_ndice"
+#~ msgid "_Index"
+#~ msgstr "�_ndice"
 
-msgid "Advanced ..."
-msgstr "Avanzadas..."
+#~ msgid "Advanced ..."
+#~ msgstr "Avanzadas..."
diff --git a/po/hu.po b/po/hu.po
index f74bdbe3de..75f806fde9 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.10.99\n"
-"POT-Creation-Date: 2001-09-27 09:46+0200\n"
+"POT-Creation-Date: 2001-10-01 19:06-0400\n"
 "PO-Revision-Date: 2001-09-27 11:02+0200\n"
 "Last-Translator: Andr�s T�m�r <timar@gnome.hu>\n"
 "Language-Team: Hungarian <hu@gnome.hu>\n"
@@ -143,7 +143,7 @@ msgstr "ISDN"
 #: addressbook/backend/ebook/e-card-simple.c:83
 #: addressbook/gui/contact-editor/e-contact-editor.c:1606
 #: addressbook/gui/contact-editor/e-contact-editor.c:1664
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:52
 msgid "Other"
 msgstr "M�s"
 
@@ -600,10 +600,10 @@ msgstr "%s VK�rty�ja"
 #: 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:1162
+#: addressbook/conduit/address-conduit.c:1167
 #: addressbook/gui/component/addressbook-factory.c:48
-#: calendar/conduits/calendar/calendar-conduit.c:1204
-#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/conduits/calendar/calendar-conduit.c:1262
+#: calendar/conduits/todo/todo-conduit.c:1034
 #: calendar/gui/alarm-notify/notify-main.c:78 calendar/gui/main.c:63
 msgid "Could not initialize Bonobo"
 msgstr "A Bonobo inicializ�l�sa nem siker�lt"
@@ -662,20 +662,20 @@ msgstr "A kurzort nem lehet bet�lteni\n"
 msgid "EBook not loaded\n"
 msgstr "Az EBook nincs bet�ltve\n"
 
-#: addressbook/conduit/address-conduit.c:726
-#: calendar/conduits/calendar/calendar-conduit.c:778
-#: calendar/conduits/todo/todo-conduit.c:592
+#: addressbook/conduit/address-conduit.c:731
+#: calendar/conduits/calendar/calendar-conduit.c:837
+#: calendar/conduits/todo/todo-conduit.c:609
 msgid "Could not start wombat server"
 msgstr "Nem siker�lt elind�tani a wombat kiszolg�l�t"
 
-#: addressbook/conduit/address-conduit.c:727
-#: calendar/conduits/calendar/calendar-conduit.c:779
-#: calendar/conduits/todo/todo-conduit.c:593
+#: addressbook/conduit/address-conduit.c:732
+#: calendar/conduits/calendar/calendar-conduit.c:838
+#: calendar/conduits/todo/todo-conduit.c:610
 msgid "Could not start wombat"
 msgstr "Nem siker�lt a wombatot elind�tani"
 
-#: addressbook/conduit/address-conduit.c:757
-#: addressbook/conduit/address-conduit.c:760
+#: addressbook/conduit/address-conduit.c:762
+#: addressbook/conduit/address-conduit.c:765
 msgid "Could not read pilot's Address application block"
 msgstr "Nem siker�lt a pilot Address application blokkj�t olvasni"
 
@@ -861,16 +861,16 @@ msgstr "_Postafi�k neve:"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: 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:93 my-evolution/my-evolution.glade.h:20
+#: mail/mail-config.glade.h:91 my-evolution/my-evolution.glade.h:20
 msgid "_Add"
 msgstr "Hozz�_ad�s"
 
 #: addressbook/gui/component/addressbook-config.glade.h:23
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:98
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:96
 #: ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
 #: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
 msgstr "S_zerkeszt�s"
@@ -1216,7 +1216,7 @@ msgstr "_N�vjegyek..."
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:834 filter/filter.glade.h:8
-#: mail/folder-browser.c:1406 mail/mail-config.glade.h:97
+#: mail/folder-browser.c:1406 mail/mail-config.glade.h:95
 #: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
@@ -2510,7 +2510,7 @@ msgid "Success"
 msgstr "Siker�lt"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1710
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1702
 #: shell/e-storage.c:520
 msgid "Unknown error"
 msgstr "Ismeretlen hiba"
@@ -2538,8 +2538,8 @@ msgstr "A protokoll nem t�mogatott"
 #: addressbook/gui/widgets/e-addressbook-util.c:41
 #: calendar/gui/calendar-model.c:726 calendar/gui/calendar-model.c:1247
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:461 camel/camel-service.c:544
-#: camel/camel-service.c:580
+#: calendar/gui/e-calendar-table.c:461 camel/camel-service.c:598
+#: camel/camel-service.c:634
 msgid "Cancelled"
 msgstr "Megszak�tva"
 
@@ -2877,18 +2877,18 @@ msgstr "Alacsony"
 msgid "Undefined"
 msgstr "Nem megadott"
 
-#: calendar/conduits/calendar/calendar-conduit.c:735
-#: calendar/conduits/todo/todo-conduit.c:548
+#: calendar/conduits/calendar/calendar-conduit.c:793
+#: calendar/conduits/todo/todo-conduit.c:564
 msgid "Error while communicating with calendar server"
 msgstr "Hib�s kommunik�ci� a napt�r kiszolg�l�val"
 
-#: calendar/conduits/calendar/calendar-conduit.c:839
-#: calendar/conduits/calendar/calendar-conduit.c:842
+#: calendar/conduits/calendar/calendar-conduit.c:896
+#: calendar/conduits/calendar/calendar-conduit.c:899
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nem siker�lt a pilot Calendar application blokkj�t olvasni"
 
-#: calendar/conduits/todo/todo-conduit.c:653
-#: calendar/conduits/todo/todo-conduit.c:656
+#: calendar/conduits/todo/todo-conduit.c:668
+#: calendar/conduits/todo/todo-conduit.c:671
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nem siker�lt a pilot Calendar ToDo blokkj�t olvasni"
 
@@ -2936,46 +2936,46 @@ msgstr "Riaszt� szolg�ltat�s"
 msgid "Factory for the alarm notification service"
 msgstr "Factory a riaszt� szolg�ltat�shoz"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:152
 #, c-format
 msgid "Notification about your appointment starting on %s and ending on %s"
 msgstr ""
 "Figyelmeztet�s a tal�lkoz�ra, amely %s-kor kezd�dik �s %s-kor v�gz�dik "
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:156
 #, c-format
 msgid "Notification about your appointment starting on %s"
 msgstr "Figyelmeztet�s a tal�lkoz�ra, amely %s-kor kezd�dik"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:161
 #, c-format
 msgid "Notification about your appointment ending on %s"
 msgstr "Figyelmeztet�s a tal�lkoz�ra, amely %s-kor v�gz�dik"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:165
 msgid "Notification about your appointment"
 msgstr "Figyelmeztet�s a tal�lkoz�ra"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:172
 #, c-format
 msgid "Notification about your task starting on %s and ending on %s"
 msgstr "Figyelmeztet�s a feladatra, amely %s-kor kezd�dik �s %s-kor v�gz�dik"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:176
 #, c-format
 msgid "Notification about your task starting on %s"
 msgstr "Figyelmeztet�s a feladatra, amely %s-kor kezd�dik"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:181
 #, c-format
 msgid "Notification about your task ending on %s"
 msgstr "Figyelmeztet�s a feladatra, amely %s-kor v�gz�dik"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:185
 msgid "Notification about your task"
 msgstr "Figyelmeztet�s a feladatra"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:267
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "Riaszt�s id�pontja: %Y %b %d, %A, %H:%M"
 
@@ -3056,7 +3056,7 @@ msgstr "%Y %B %d"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: calendar/gui/calendar-commands.c:467
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1443
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1446
 msgid "%d %B"
 msgstr "%B %d"
 
@@ -3165,9 +3165,9 @@ msgstr "A sz�zal�kos �rt�k 0 �s 100 k�z�tt lehet."
 
 #. An empty string is the same as 'None'.
 #: calendar/gui/calendar-model.c:1239 calendar/gui/dialogs/meeting-page.c:332
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1444
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1446
 #: mail/mail-accounts.c:143 mail/mail-accounts.c:390
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:50
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:203
 #: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:453
 #: widgets/misc/e-dateedit.c:1453 widgets/misc/e-dateedit.c:1568
@@ -3234,8 +3234,8 @@ msgstr "Napt�r"
 msgid "Folder containing appointments and events"
 msgstr "Tal�lkoz�kat �s esem�nyeket tartalmaz� mappa"
 
-#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1720
-#: my-evolution/e-summary-tasks.c:231 my-evolution/e-summary-tasks.c:247
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1723
+#: my-evolution/e-summary-tasks.c:237 my-evolution/e-summary-tasks.c:253
 #: shell/e-local-storage.c:178 shell/e-shortcuts.c:1059
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
@@ -3491,7 +3491,7 @@ msgstr "tal�lkoz� v�ge"
 msgid "hour(s)"
 msgstr "�ra"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:118
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:116
 msgid "minute(s)"
 msgstr "perc"
 
@@ -3760,55 +3760,55 @@ msgstr "%s  V�ltoztatt�l. Elveted a v�ltoz�sokat �s friss�ted a szerkeszt�t?"
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Nem v�ltoztatt�l, friss�ted a szerkeszt�t?"
 
-#: calendar/gui/dialogs/comp-editor-util.c:167 calendar/gui/print.c:2129
+#: calendar/gui/dialogs/comp-editor-util.c:167 calendar/gui/print.c:2132
 msgid " to "
 msgstr " - "
 
-#: calendar/gui/dialogs/comp-editor-util.c:171 calendar/gui/print.c:2133
+#: calendar/gui/dialogs/comp-editor-util.c:171 calendar/gui/print.c:2136
 msgid " (Completed "
 msgstr " (K�sz "
 
-#: calendar/gui/dialogs/comp-editor-util.c:173 calendar/gui/print.c:2135
+#: calendar/gui/dialogs/comp-editor-util.c:173 calendar/gui/print.c:2138
 msgid "Completed "
 msgstr "K�sz "
 
-#: calendar/gui/dialogs/comp-editor-util.c:178 calendar/gui/print.c:2140
+#: calendar/gui/dialogs/comp-editor-util.c:178 calendar/gui/print.c:2143
 msgid " (Due "
 msgstr " (Esed�kes "
 
-#: calendar/gui/dialogs/comp-editor-util.c:180 calendar/gui/print.c:2142
+#: calendar/gui/dialogs/comp-editor-util.c:180 calendar/gui/print.c:2145
 msgid "Due "
 msgstr "Esed�kes "
 
-#: calendar/gui/dialogs/comp-editor.c:514
+#: calendar/gui/dialogs/comp-editor.c:521
 msgid "Edit Appointment"
 msgstr "Megbesz�l�s szerkeszt�se"
 
-#: calendar/gui/dialogs/comp-editor.c:519
+#: calendar/gui/dialogs/comp-editor.c:526
 #, c-format
 msgid "Appointment - %s"
 msgstr "Id�pont - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:522
+#: calendar/gui/dialogs/comp-editor.c:529
 #, c-format
 msgid "Task - %s"
 msgstr "Feladat - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:525
+#: calendar/gui/dialogs/comp-editor.c:532
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Napl� bejegyz�s - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:539
+#: calendar/gui/dialogs/comp-editor.c:546
 msgid "No summary"
 msgstr "Nincs �sszegz�s"
 
-#: calendar/gui/dialogs/comp-editor.c:949 mail/mail-callbacks.c:1671
+#: calendar/gui/dialogs/comp-editor.c:952 mail/mail-callbacks.c:1671
 #: mail/mail-display.c:100
 msgid "Overwrite file?"
 msgstr "Fel�l�rod a f�jlt?"
 
-#: calendar/gui/dialogs/comp-editor.c:953 mail/mail-callbacks.c:1677
+#: calendar/gui/dialogs/comp-editor.c:956 mail/mail-callbacks.c:1677
 #: mail/mail-display.c:104
 msgid ""
 "A file by that name already exists.\n"
@@ -3817,12 +3817,12 @@ msgstr ""
 "A megadott n�ven m�r l�tezik f�jl.\n"
 "Fel�l�rod?"
 
-#: calendar/gui/dialogs/comp-editor.c:1016 ui/evolution-comp-editor.xml.h:13
+#: calendar/gui/dialogs/comp-editor.c:1019 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "Ment�s m�sk�nt..."
 
-#: calendar/gui/dialogs/comp-editor.c:1169
+#: calendar/gui/dialogs/comp-editor.c:1172
 msgid "Unable to obtain current version!"
 msgstr "Nem siker�lt megszerezni a legfrissebb v�ltozatot!"
 
@@ -4044,7 +4044,7 @@ msgstr "�llapot"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:18
-#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:88
+#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:86
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "T�pus"
@@ -4066,8 +4066,8 @@ msgstr "_M�sok megh�v�sa"
 msgid "_Other Organizer"
 msgstr "_M�sik szervez�"
 
-#: calendar/gui/dialogs/recurrence-page.c:422 calendar/gui/print.c:1852
-#: calendar/gui/print.c:1854 calendar/gui/print.c:1855
+#: calendar/gui/dialogs/recurrence-page.c:422 calendar/gui/print.c:1855
+#: calendar/gui/print.c:1857 calendar/gui/print.c:1858
 msgid "%a %b %d %Y"
 msgstr "%Y %b %d, %a"
 
@@ -4188,7 +4188,7 @@ msgid "Progress"
 msgstr "Folyamatban"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:925
+#: my-evolution/e-summary-preferences.c:949
 msgid "URL:"
 msgstr "URL:"
 
@@ -4383,7 +4383,7 @@ 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:285 calendar/gui/e-day-view.c:1374
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1459
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
 msgid "%A %d %B"
 msgstr "%B %d, %A"
 
@@ -4396,13 +4396,13 @@ msgstr "%b %d"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:608 calendar/gui/e-week-view.c:345
-#: calendar/gui/print.c:766
+#: calendar/gui/print.c:769
 msgid "am"
 msgstr "de"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:348
-#: calendar/gui/print.c:768
+#: calendar/gui/print.c:771
 msgid "pm"
 msgstr "du"
 
@@ -4648,7 +4648,8 @@ msgstr "Friss�t�s k�sz\n"
 
 #: calendar/gui/e-itip-control.c:1134
 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"
+msgstr ""
+"A r�sztvev� �llapot�t nem lehetett friss�teni, mert az �llapot �rv�nytelen!\n"
 
 #: calendar/gui/e-itip-control.c:1142
 msgid "Attendee status ould not be updated!\n"
@@ -4660,7 +4661,8 @@ msgstr "A r�sztvev� �llapota friss�tve\n"
 
 #: calendar/gui/e-itip-control.c:1146
 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�"
+msgstr ""
+"A r�sztvev� �llapot�t nem lehetett friss�teni, mert az elem nem l�tezik t�bb�"
 
 #: calendar/gui/e-itip-control.c:1174
 msgid "I couldn't remove the item from your calendar file!\n"
@@ -4970,201 +4972,201 @@ msgstr "A szervez�t be kell �ll�tani."
 msgid "Could not create the component editor factory"
 msgstr "Nem siker�lt l�trehozni a komponensszerkeszt� factoryt"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:432
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "Su"
 msgstr "V"
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "Mo"
 msgstr "H"
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "Tu"
 msgstr "K"
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "We"
 msgstr "Sze"
 
-#: calendar/gui/print.c:497
+#: calendar/gui/print.c:500
 msgid "Th"
 msgstr "Cs"
 
-#: calendar/gui/print.c:497
+#: calendar/gui/print.c:500
 msgid "Fr"
 msgstr "P"
 
-#: calendar/gui/print.c:497
+#: calendar/gui/print.c:500
 msgid "Sa"
 msgstr "Szo"
 
 #. Day
-#: calendar/gui/print.c:1828
+#: calendar/gui/print.c:1831
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Kijel�lt nap (%Y %b %d, %a)"
 
-#: calendar/gui/print.c:1847 calendar/gui/print.c:1851
+#: calendar/gui/print.c:1850 calendar/gui/print.c:1854
 msgid "%a %b %d"
 msgstr "%b %d, %a"
 
-#: calendar/gui/print.c:1848
+#: calendar/gui/print.c:1851
 msgid "%a %d %Y"
 msgstr "%Y %d, %a"
 
-#: calendar/gui/print.c:1859
+#: calendar/gui/print.c:1862
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Kijel�lt h�t (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1867
+#: calendar/gui/print.c:1870
 msgid "Selected month (%b %Y)"
 msgstr "Kijel�lt h�nap (%Y %b)"
 
 #. Year
-#: calendar/gui/print.c:1874
+#: calendar/gui/print.c:1877
 msgid "Selected year (%Y)"
 msgstr "Kijel�lt �v (%Y)"
 
-#: calendar/gui/print.c:2215
+#: calendar/gui/print.c:2221
 msgid "Print Calendar"
 msgstr "Napt�r nyomtat�sa"
 
-#: calendar/gui/print.c:2303 calendar/gui/print.c:2395
+#: calendar/gui/print.c:2312 calendar/gui/print.c:2404
 #: mail/mail-callbacks.c:2080 my-evolution/e-summary.c:607
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
 msgstr "Nyomtat�si k�p"
 
-#: calendar/gui/print.c:2332
+#: calendar/gui/print.c:2341
 msgid "Print Item"
 msgstr "Elem nyomtat�sa"
 
-#: calendar/gui/print.c:2413
+#: calendar/gui/print.c:2422
 msgid "Print Setup"
 msgstr "Nyomtat�si be�ll�t�sok"
 
@@ -5370,7 +5372,7 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr "�jraszinkroniz�l�s a kiszolg�l�val"
 
-#: camel/camel-disco-store.c:305
+#: camel/camel-disco-store.c:336
 msgid "You must be working online to complete this operation"
 msgstr "A m�velet befejez�s�hez h�l�zati kapcsolattal kell rendelkezned"
 
@@ -5424,7 +5426,7 @@ msgstr "Hiba a sz�r� feldolgoz�sa k�zben: %s: %s"
 msgid "Error executing filter: %s: %s"
 msgstr "Hiba a sz�r� v�grehajt�sa k�zben: %s: %s"
 
-#: camel/camel-filter-search.c:487 camel/camel-filter-search.c:494
+#: camel/camel-filter-search.c:494 camel/camel-filter-search.c:501
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Hiba a sz�rt keres�s v�grehajt�sa k�zben: %s: %s"
@@ -5586,65 +5588,65 @@ msgstr "Add meg %s jelszavadat"
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr "Nem lehet elk�ldeni a levelet: nincs c�mzett."
 
-#: camel/camel-pgp-context.c:532 camel/camel-pgp-context.c:704
+#: camel/camel-pgp-context.c:532 camel/camel-pgp-context.c:706
 msgid "Cannot sign this message: no password provided"
 msgstr "Nem lehet al��rni a levelet: nincs jelsz� megadva"
 
-#: camel/camel-pgp-context.c:538 camel/camel-pgp-context.c:710
+#: camel/camel-pgp-context.c:538 camel/camel-pgp-context.c:712
 #, fuzzy, c-format
 msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "Nem siker�lt cs�vezet�ket l�trehozni a GPG/PGP-hez: %s"
 
-#: camel/camel-pgp-context.c:697
+#: camel/camel-pgp-context.c:699
 #, fuzzy
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr "Nem lehet elk�ldeni a levelet: nincs c�mzett."
 
-#: camel/camel-pgp-context.c:887
+#: camel/camel-pgp-context.c:891
 #, fuzzy
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr "Nem lehet elk�ldeni a levelet: nincs c�mzett."
 
-#: camel/camel-pgp-context.c:893
+#: camel/camel-pgp-context.c:897
 #, fuzzy, c-format
 msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "Nem siker�lt cs�vezet�ket l�trehozni a GPG/PGP-hez: %s"
 
-#: camel/camel-pgp-context.c:904
+#: camel/camel-pgp-context.c:908
 #, fuzzy, c-format
 msgid "Cannot verify this message: couldn't create temp file: %s"
 msgstr "Nem siker�lt l�trehozni az ideiglenes f�jlt: %s"
 
-#: camel/camel-pgp-context.c:1070
+#: camel/camel-pgp-context.c:1076
 #, fuzzy
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr "Nem lehet elk�ldeni a levelet: nincs c�mzett."
 
-#: camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1086
 #, fuzzy
 msgid "Cannot encrypt this message: no password provided"
 msgstr "Nem lehet elk�ldeni a levelet: a felad� c�me �rv�nytelen."
 
-#: camel/camel-pgp-context.c:1087
+#: camel/camel-pgp-context.c:1093
 #, fuzzy, c-format
 msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "Nem siker�lt cs�vezet�ket l�trehozni a GPG/PGP-hez: %s"
 
-#: camel/camel-pgp-context.c:1096
+#: camel/camel-pgp-context.c:1102
 #, fuzzy
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr "Nem lehet elk�ldeni a levelet: nincs c�mzett."
 
-#: camel/camel-pgp-context.c:1256
+#: camel/camel-pgp-context.c:1264
 #, fuzzy
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr "Nem lehet elk�ldeni a levelet: nincs c�mzett."
 
-#: camel/camel-pgp-context.c:1264
+#: camel/camel-pgp-context.c:1272
 msgid "Cannot decrypt this message: no password provided"
 msgstr "Nem lehet visszafejteni a levelet: nem volt jelsz� megadva"
 
-#: camel/camel-pgp-context.c:1271
+#: camel/camel-pgp-context.c:1279
 #, fuzzy, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "Nem siker�lt cs�vezet�ket l�trehozni a GPG/PGP-hez: %s"
@@ -5689,13 +5691,13 @@ msgstr "Nem siker�lt csatlakozni %s %d portj�hoz: %s"
 msgid "(unknown host)"
 msgstr "(ismeretlen kiszolg�l�)"
 
-#: camel/camel-remote-store.c:361 camel/camel-remote-store.c:423
-#: camel/camel-remote-store.c:486
+#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
+#: camel/camel-remote-store.c:483
 #: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "M�velet megszak�tva"
 
-#: camel/camel-remote-store.c:489
+#: camel/camel-remote-store.c:486
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "A kiszolg�l� v�ratlanul sz�tkapcsolt: %s"
@@ -5807,7 +5809,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:492
+#: camel/providers/imap/camel-imap-store.c:494
 msgid "Bad authentication response from server."
 msgstr "Rossz hiteles�t�si v�lasz a kiszolg�l�t�l"
 
@@ -5825,7 +5827,7 @@ msgstr "Ismeretlen hiteles�t�si �llapot."
 
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:302
-#: camel/providers/pop3/camel-pop3-provider.c:68 mail/mail-config.glade.h:57
+#: camel/providers/pop3/camel-pop3-provider.c:68 mail/mail-config.glade.h:55
 msgid "Password"
 msgstr "Jelsz�"
 
@@ -5855,37 +5857,37 @@ msgstr "POP az SMTP hiteles�t�s el�tt nem pop forr�s haszn�lat�val"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "A regul�ris kifejez�s leford�t�sa sikertelen: %s: %s"
 
-#: camel/camel-service.c:154
+#: camel/camel-service.c:157
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "'%s' URL-ben kell lennie felhaszn�l�n�v �sszetev�nek"
 
-#: camel/camel-service.c:162
+#: camel/camel-service.c:165
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "'%s' URL-ben kell lennie g�pn�v �sszetev�nek"
 
-#: camel/camel-service.c:170
+#: camel/camel-service.c:173
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "'%s' URL-ben kell lennie �tvonal �sszetev�nek"
 
-#: camel/camel-service.c:548
+#: camel/camel-service.c:602
 #, c-format
 msgid "Resolving: %s"
 msgstr "'%s' felold�sa"
 
-#: camel/camel-service.c:575
+#: camel/camel-service.c:629
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Sikertelen n�vkikeres�s: %s"
 
-#: camel/camel-service.c:600
+#: camel/camel-service.c:654
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Sikertelen g�pkikeres�s: %s: a g�p nem tal�lhat�"
 
-#: camel/camel-service.c:602
+#: camel/camel-service.c:656
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Sikertelen g�pkikeres�s: %s: ismeretlen ok"
@@ -5900,12 +5902,12 @@ msgstr ""
 "A leveleket m�s mapp�kon futtatott lek�rdez�s eredm�ny�t�l f�gg�en "
 "csoportos�thatod."
 
-#: camel/camel-session.c:322 camel/camel-session.c:391
+#: camel/camel-session.c:324 camel/camel-session.c:393
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "'%s' protokollhoz nincs t�mogat�s"
 
-#: camel/camel-session.c:508
+#: camel/camel-session.c:510
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -6036,7 +6038,7 @@ msgstr "Nem siker�lt z�rolni %s k�nyvt�rat: %s"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Nem siker�lt bet�lteni a mapp�t: %s: %s"
 
-#: camel/camel-vtrash-folder.c:106
+#: camel/camel-vtrash-folder.c:109
 msgid "You cannot copy messages from this trash folder."
 msgstr "Nem lehet leveleket m�solni ebb�l a kukamapp�b�l."
 
@@ -6084,7 +6086,7 @@ msgid "Scanning for changed messages"
 msgstr "Megv�ltozott levelek keres�se"
 
 #: camel/providers/imap/camel-imap-folder.c:1491
-#: camel/providers/imap/camel-imap-folder.c:1890
+#: camel/providers/imap/camel-imap-folder.c:1899
 msgid "This message is not currently available"
 msgstr "Ez a lev�l jelenleg nem el�rhet�"
 
@@ -6097,7 +6099,7 @@ msgstr "�sszefoglal� adatok let�lt�se az �j levelekhez."
 msgid "Scanning for new messages"
 msgstr "�j levelek keres�se"
 
-#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/imap/camel-imap-folder.c:1936
 msgid "Could not find message body in FETCH response."
 msgstr "Nem tal�lhat� a lev�lt�rzs a FETCH v�laszban."
 
@@ -6156,28 +6158,28 @@ 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:515
+#: camel/providers/imap/camel-imap-store.c:517
 #, 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:525
+#: camel/providers/imap/camel-imap-store.c:527
 #: camel/providers/smtp/camel-smtp-transport.c:388
 #, 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:549
+#: camel/providers/imap/camel-imap-store.c:551
 #, 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:564
+#: camel/providers/imap/camel-imap-store.c:566
 #: camel/providers/smtp/camel-smtp-transport.c:432
 msgid "You didn't enter a password."
 msgstr "Nem adt�l meg jelsz�t."
 
-#: camel/providers/imap/camel-imap-store.c:590
+#: camel/providers/imap/camel-imap-store.c:592
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6188,12 +6190,12 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:889
+#: camel/providers/imap/camel-imap-store.c:891
 #, c-format
 msgid "No such folder %s"
 msgstr "Nincs %s mappa."
 
-#: camel/providers/imap/camel-imap-store.c:1090
+#: camel/providers/imap/camel-imap-store.c:1131
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "A sz�l�mappa nem tartalmazhat almapp�kat"
 
@@ -6226,51 +6228,51 @@ msgstr "Qmail maildir-form�tum� f�jlok"
 msgid "For storing local mail in qmail maildir directories."
 msgstr "A helyi levelek t�rol�sa qmail maildir k�nyvt�rakban"
 
-#: camel/providers/local/camel-local-provider.c:77
+#: camel/providers/local/camel-local-provider.c:78
 msgid "Standard Unix mbox spools"
 msgstr "Szabv�nyos Unix mbox t�rol�k"
 
-#: camel/providers/local/camel-local-provider.c:78
+#: camel/providers/local/camel-local-provider.c:79
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr "A helyi levelek olvas�sa �s t�rol�sa szabv�nyos mbox spool f�jlokban"
 
-#: camel/providers/local/camel-local-store.c:127
-#: camel/providers/local/camel-spool-store.c:112
+#: camel/providers/local/camel-local-store.c:132
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "%s t�rol�gy�k�r nem abszol�t �tvonal"
 
-#: camel/providers/local/camel-local-store.c:134
+#: camel/providers/local/camel-local-store.c:139
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "%s t�rol�gy�k�r nem k�z�ns�ges k�nyvt�r"
 
-#: camel/providers/local/camel-local-store.c:142
-#: camel/providers/local/camel-local-store.c:158
+#: camel/providers/local/camel-local-store.c:147
+#: camel/providers/local/camel-local-store.c:163
 #, 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:173
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "A helyi t�rol�k nem rendelkeznek Bej�v� mapp�val"
 
-#: camel/providers/local/camel-local-store.c:183
+#: camel/providers/local/camel-local-store.c:190
 #, c-format
 msgid "Local mail file %s"
 msgstr "%s helyi lev�l f�jl"
 
-#: camel/providers/local/camel-local-store.c:240
+#: camel/providers/local/camel-local-store.c:247
 #, 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:282
+#: camel/providers/local/camel-local-store.c:289
 #, 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:292
+#: camel/providers/local/camel-local-store.c:299
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Nem siker�lt '%s' mappaindexf�jlt t�r�lni: %s"
@@ -6557,26 +6559,26 @@ msgstr "Nem siker�lt megnyitni az MH k�nyvt�r el�r�si �tj�t: %s: %s"
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "Nem siker�lt a levelet a spool f�jlhoz hozz�f�zni: %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:133
+#: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Spool `%s' does not exist or is not a regular file"
 msgstr "`%s' spool nem l�tezik, vagy  nem k�z�ns�ges f�jl."
 
-#: camel/providers/local/camel-spool-store.c:159
+#: camel/providers/local/camel-spool-store.c:142
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "`%s/%s' mappa nem l�tezik."
 
-#: camel/providers/local/camel-spool-store.c:181
+#: camel/providers/local/camel-spool-store.c:164
 #, c-format
 msgid "Spool mail file %s"
 msgstr "%s spool lev�lf�jl"
 
-#: camel/providers/local/camel-spool-store.c:227
+#: camel/providers/local/camel-spool-store.c:210
 msgid "Spool folders cannot be renamed"
 msgstr "Spool mapp�t nem lehet �tnevezni"
 
-#: camel/providers/local/camel-spool-store.c:235
+#: camel/providers/local/camel-spool-store.c:218
 msgid "Spool folders cannot be deleted"
 msgstr "Spool mapp�t nem lehet t�r�lni"
 
@@ -6701,30 +6703,30 @@ msgstr "POP �sszefoglal� let�lt�se"
 msgid "Could not check POP server for new messages: %s"
 msgstr "Nem siker�lt az �j levelek ellen�rz�se a POP kiszolg�l�n: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:235
+#: camel/providers/pop3/camel-pop3-folder.c:242
 msgid "Could not open folder: message listing was incomplete."
 msgstr "Nem siker�lt megnyitni a mapp�t: az �zenetlista nem teljes."
 
-#: camel/providers/pop3/camel-pop3-folder.c:259
+#: camel/providers/pop3/camel-pop3-folder.c:266
 msgid "Expunging deleted messages"
 msgstr "A t�rl�sre kijel�lt levelek elt�vol�t�sa"
 
-#: camel/providers/pop3/camel-pop3-folder.c:335
+#: camel/providers/pop3/camel-pop3-folder.c:342
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "Nem siker�lt let�lteni a levelet: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:351
+#: camel/providers/pop3/camel-pop3-folder.c:358
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Nem siker�lt let�lteni a levelet a %s POP kiszolg�l�r�l: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:374
+#: camel/providers/pop3/camel-pop3-folder.c:381
 #, c-format
 msgid "No message with uid %s"
 msgstr "Nincs %s azonos�t�j� lev�l"
 
-#: camel/providers/pop3/camel-pop3-folder.c:378
+#: camel/providers/pop3/camel-pop3-folder.c:385
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "%d. POP lev�l let�lt�se"
@@ -6742,7 +6744,7 @@ msgstr "Az �zenetek maradjanak meg a kiszolg�l�n is"
 msgid "Delete after %s day(s)"
 msgstr "T�rl�s a kiszolg�l�r�l %s nap m�lva"
 
-#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:56
+#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:54
 msgid "POP"
 msgstr "POP"
 
@@ -6837,7 +6839,7 @@ msgid "Unexpected response from POP server: %s"
 msgstr "V�ratlan v�lasz az IMAP kiszolg�l�t�l: %s"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:73
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -6890,7 +6892,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Lev�lk�ld�s a sendmail programon kereszt�l"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:68
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:66
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -7675,8 +7677,8 @@ msgstr ""
 "Hopp�, elfelejtett�l mapp�t v�lasztani.\n"
 "L�pj vissza, �s adj meg egy �rv�nyes mappanevet, ahov� a leveleket k�red."
 
-#: filter/filter-folder.c:232 filter/vfolder-rule.c:351
-#: mail/mail-account-gui.c:820
+#: filter/filter-folder.c:232 filter/vfolder-rule.c:356
+#: mail/mail-account-gui.c:822
 msgid "Select Folder"
 msgstr "V�lassz mapp�t"
 
@@ -7987,7 +7989,7 @@ msgstr "Szab�ly szerkeszt�se"
 msgid "Score Rules"
 msgstr "Pontsz�mszab�lyok"
 
-#: filter/vfolder-rule.c:203
+#: filter/vfolder-rule.c:206
 msgid "Oops.  You need to to specify at least one folder as a source."
 msgstr "Hopp�! Legal�bb egy mapp�t meg kell adnod, mint forr�st."
 
@@ -8151,25 +8153,25 @@ msgstr "Tulajdons�gok..."
 msgid "Change this folder's properties"
 msgstr "Mappa tulajdons�gainak m�dos�t�sa"
 
-#: mail/component-factory.c:700
+#: mail/component-factory.c:698
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:814
+#: mail/component-factory.c:812
 msgid "New Mail Message"
 msgstr "�j lev�l"
 
-#: mail/component-factory.c:814
+#: mail/component-factory.c:812
 msgid "New _Mail Message"
 msgstr "�_j lev�l"
 
-#: mail/component-factory.c:845
+#: mail/component-factory.c:843
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Nem siker�lt az Evol�ci� levelez� komponens�t inicializ�lni."
 
-#: mail/component-factory.c:1034
+#: mail/component-factory.c:1032
 msgid "Cannot register storage with shell"
 msgstr "Nem siker�lt regisztr�lni a t�rol�t a h�jban"
 
@@ -8407,18 +8409,18 @@ msgstr "Evol�ci� News-szerkeszt�"
 msgid "Evolution Account Editor"
 msgstr "Evol�ci� Postafi�k-szerkeszt�"
 
-#: mail/mail-account-gui.c:945
+#: mail/mail-account-gui.c:947
 #, fuzzy
 msgid "Could not save signature file."
 msgstr ""
 "Nem siker�lt megnyitni az al��r�sf�jlt: %s\n"
 "%s"
 
-#: mail/mail-account-gui.c:1022
+#: mail/mail-account-gui.c:1024
 msgid "Save signature"
 msgstr "Al��r�s ment�se"
 
-#: mail/mail-account-gui.c:1028
+#: mail/mail-account-gui.c:1030
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -8428,7 +8430,7 @@ msgstr ""
 "\n"
 "Akarod menteni a v�ltoz�saidat?"
 
-#: mail/mail-account-gui.c:1611
+#: mail/mail-account-gui.c:1615
 msgid "You may not create two accounts with the same name."
 msgstr "Nem hozhatsz l�tre k�t egyez� nev� postafi�kot."
 
@@ -8461,7 +8463,7 @@ msgid "Are you sure you want to delete this news account?"
 msgstr "T�nyleg t�r�lni akarod ezt a news-hozz�f�r�st?"
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:757 mail/mail-config.glade.h:45
+#: mail/mail-accounts.c:760 mail/mail-config.glade.h:45
 msgid "Mail Settings"
 msgstr "Levelez� be�ll�t�sai"
 
@@ -8728,30 +8730,32 @@ msgstr ""
 msgid "Evolution Account Assistant"
 msgstr "Evol�ci� Postafi�k var�zsl�"
 
-#: mail/mail-config.c:313
+#: mail/mail-config.c:315
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Postafi�k"
 
-#: mail/mail-config.c:1485
-msgid "Evolution Shortcuts"
-msgstr "Evol�ci� ind�t�ikonok"
+#: mail/mail-config.c:1618
+#, c-format
+msgid ""
+"Could not get inbox for new mail store:\n"
+"%s\n"
+"No shortcut will be created."
+msgstr ""
 
-#. right now, the URL always works basically as a matter of luck...
-#. * both IMAP and mbox spool stores have INBOX as their inbox folder
-#. * name. I don't think this will work with maildir. How can we figure out
-#. * what shortcut to insert?
+#. Create the shortcut. FIXME: This only works if the
+#. * full name matches the path.
 #.
-#: mail/mail-config.c:1617
+#: mail/mail-config.c:1629
 #, c-format
 msgid "%s: Inbox"
 msgstr "%s: Bej�v� �zenetek"
 
-#: mail/mail-config.c:1850
+#: mail/mail-config.c:1873
 msgid "Checking Service"
 msgstr "Szolg�ltat�s ellen�rz�se"
 
-#: mail/mail-config.c:1921 mail/mail-config.c:1924
+#: mail/mail-config.c:1944 mail/mail-config.c:1947
 msgid "Connecting to server..."
 msgstr "Kapcsol�d�s a kiszolg�l�hoz..."
 
@@ -8928,147 +8932,139 @@ msgid "Make this my _default account"
 msgstr "L_egyen ez az alap�rtelmezett postafi�k"
 
 #: mail/mail-config.glade.h:48
-msgid "Message _preview should be displayed by default"
-msgstr "Legyen _betekint� ablakt�bla alap�rtelmez�s szerint"
-
-#: mail/mail-config.glade.h:49
-msgid "Message list should display in a _threaded fashion by default"
-msgstr "A leveleket _sz�lank�nt rendezze alap�rtelmez�s szerint"
-
-#: mail/mail-config.glade.h:50
 msgid "NNTP Server:"
 msgstr "NNTP kiszolg�l�:"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:49
 msgid "News"
 msgstr "News"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:51
 msgid "Optional Information"
 msgstr "Egy�b inform�ci�"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:53
 msgid "PGP Key ID:"
 msgstr "PGP kulcs azonos�t�ja:"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:56
 msgid "Pick a color"
 msgstr "V�lassz egy sz�nt"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:57
 msgid "Pretty Good Privacy"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:58
 msgid "Prompt when sending messages with an _empty subject"
 msgstr "K�rdez, ha �_res t�rggyal akarod elk�ldeni a levelet"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:59
 msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr "K�rdez, ha csak _titkos m�solat szerepel a c�mzettek k�z�tt"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:60
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:61
 msgid "Quoted"
 msgstr "Id�zet"
 
-#: mail/mail-config.glade.h:64 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Levelek fogad�sa"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 msgid "Receiving Mail"
 msgstr "Levelek fogad�sa"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "Receiving Options"
 msgstr "Fogad�s be�ll�t�sai"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:65
 msgid "Required Information"
 msgstr "Sz�ks�ges inform�ci�"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Secure MIME"
 msgstr "Biztons�gos MIME"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Security"
 msgstr "Biztons�g"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Select Filter Log file..."
 msgstr "V�lassz egy sz�r�napl�f�jlt"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:70
 msgid "Select PGP binary"
 msgstr "V�laszd ki a PGP programot"
 
-#: mail/mail-config.glade.h:73 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:71 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Lev�l k�ld�se"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:72
 msgid "Sending Mail"
 msgstr "Lev�l k�ld�se"
 
-#: mail/mail-config.glade.h:76 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:74 mail/message-list.etspec.h:6
 #: shell/e-local-storage.c:177
 msgid "Sent"
 msgstr "Elk�ldve"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:75
 msgid "Sent and Draft Messages"
 msgstr "Elk�ld�tt levelek �s piszkozatok"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "Sent messages folder:"
 msgstr "Elk�ld�tt levelek mapp�ja"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:77
 msgid "Server Configuration"
 msgstr "Kiszolg�l� be�ll�t�sa"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:78
 msgid "Server Type: "
 msgstr "Kiszolg�l� t�pusa: "
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "Server requires _authentication"
 msgstr "A kiszolg�l� megk�veteli a _hiteles�t�st"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:80
 msgid "Signature file:"
 msgstr "Al��r�s f�jl:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid "Source"
 msgstr "Forr�s"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Source Information"
 msgstr "Forr�sinform�ci�"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:83
 msgid "Sources"
 msgstr "Forr�sok"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 msgid "Special Folders"
 msgstr "K�l�nleges mapp�k"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:85
 msgid "Standard Unix mbox"
 msgstr "Szabv�nyos Unix mbox"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:87
 msgid "Use secure connection (_SSL)"
 msgstr "Biztons�gos kapcsolat haszn�lata (_SSL)"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:88
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -9078,103 +9074,103 @@ msgstr ""
 "\n"
 "A folytat�shoz kattints a \"Tov�bb\" gombra."
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:92
 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:95
+#: mail/mail-config.glade.h:93
 msgid "_Automatically check for new mail every"
 msgstr "Az �j _levelek automatikus lek�rdez�se minden"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:94
 msgid "_Check for supported types"
 msgstr "_T�mogatott t�pusok detekt�l�sa"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:97
 msgid "_Email Address:"
 msgstr "_Emailc�m:"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:98
 msgid "_Empty trash folders on exit"
 msgstr "_Kuka �r�t�se kil�p�skor"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:99
 msgid "_Full Name:"
 msgstr "_Teljes n�v:"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:100
 msgid "_HTML Signature:"
 msgstr "_HTML al��r�s:"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:101
 msgid "_Highlight citations with"
 msgstr "_Id�zetek kiemel�se"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "_Host:"
 msgstr "_G�p:"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:103
 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:106
+#: mail/mail-config.glade.h:104
 msgid "_Log filter actions to:"
 msgstr "Sz�r�m�veletek _napl�z�sa ide:"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 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:108
+#: mail/mail-config.glade.h:106
 msgid "_Name:"
 msgstr "_N�v:"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 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:110
+#: mail/mail-config.glade.h:108
 msgid "_Organization:"
 msgstr "_Szervezet:"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "_PGP binary path:"
 msgstr "_PGP program el�r�si �tja:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "_Path:"
 msgstr "�_tvonal:"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "_Remember this password"
 msgstr "_Jelsz� megjegyz�se"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "_Send mail in HTML format by default."
 msgstr "A levelet _HTML form�tumban k�ldi alap�rtelmez�sk�nt."
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "_Signature file:"
 msgstr "A_l��r�s f�jl:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "_Username:"
 msgstr "_Felhaszn�l�n�v:"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 msgid "description"
 msgstr "le�r�s"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 msgid "newswindow1"
 msgstr "newswindow1"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:118
 msgid "placeholder"
 msgstr "helykit�lt�"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:119
 msgid "seconds."
 msgstr "m�sodperc."
 
@@ -9297,64 +9293,64 @@ msgstr "C�mzett"
 msgid "Cc"
 msgstr "M�solat"
 
-#: mail/mail-format.c:1355
+#: mail/mail-format.c:1357
 msgid "No GPG/PGP program configured."
 msgstr "Nincs be�ll�tva GPG/PGP program."
 
-#: mail/mail-format.c:1371
+#: mail/mail-format.c:1373
 msgid "Encrypted message not displayed"
 msgstr "A titkos�tott �zenet nem jelenik meg"
 
-#: mail/mail-format.c:1382
+#: mail/mail-format.c:1384
 msgid "Encrypted message"
 msgstr "Titkos�tott �zenet"
 
-#: mail/mail-format.c:1383
+#: mail/mail-format.c:1385
 msgid "Click icon to decrypt."
 msgstr "A titkos�t�s visszafejt�s�hez kattints az ikonra."
 
-#: mail/mail-format.c:1438
+#: mail/mail-format.c:1440
 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:1449
+#: mail/mail-format.c:1451
 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:2126
+#: mail/mail-format.c:2128
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Mutat� FTP-helyre (%s)"
 
-#: mail/mail-format.c:2140
+#: mail/mail-format.c:2142
 #, 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:2145
+#: mail/mail-format.c:2147
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Mutat� hely f�jlra (%s)"
 
-#: mail/mail-format.c:2174
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Mutat� t�voli adatra (%s)"
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2184
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Mutat� ismeretlen k�ls� adatra (\"%s\" t�pus)"
 
-#: mail/mail-format.c:2187
+#: mail/mail-format.c:2189
 msgid "Malformed external-body part."
 msgstr "Hib�s k�ls� t�rzsr�sz."
 
-#: mail/mail-local.c:547
+#: mail/mail-local.c:563
 msgid "Reconfiguring folder"
 msgstr "Mappa �jrabe�ll�t�sa"
 
-#: mail/mail-local.c:620
+#: mail/mail-local.c:636
 #, fuzzy, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -9363,29 +9359,29 @@ msgstr ""
 "Nem siker�lt elmenteni a mappa metainf�j�t, val�sz�n�leg nem tudod t�bb� "
 "megnyitni ezt mapp�t: %s"
 
-#: mail/mail-local.c:673
+#: mail/mail-local.c:689
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Nem siker�lt z�rolni %s k�nyvt�rat: %s"
 
-#: mail/mail-local.c:719
+#: mail/mail-local.c:735
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 "Nem siker�lt t�r�lni a mapp�t:\n"
 "%s"
 
-#: mail/mail-local.c:1049
+#: mail/mail-local.c:1075
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "\"%s\" mappa �talak�t�sa \"%s\" form�tumra"
 
-#: mail/mail-local.c:1064
+#: mail/mail-local.c:1090
 #, 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:1086
+#: mail/mail-local.c:1112
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -9393,13 +9389,13 @@ msgstr ""
 "Ha nem tudod t�bb� megnyitni ezt a postafi�kot, \n"
 "akkor esetleg k�zzel kell megjav�tanod."
 
-#: mail/mail-local.c:1177
+#: mail/mail-local.c:1200
 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:1187
-#, c-format
-msgid "Reconfigure %s"
+#: mail/mail-local.c:1209
+#, fuzzy, c-format
+msgid "Reconfigure /%s"
 msgstr "%s �jrabe�ll�t�sa"
 
 #: mail/mail-mt.c:199
@@ -9438,7 +9434,7 @@ msgstr "�rd be %s jelszav�t"
 msgid "Enter Password"
 msgstr "�rd be a jelsz�t"
 
-#: mail/mail-mt.c:880
+#: mail/mail-mt.c:886
 msgid "Working"
 msgstr "V�rj"
 
@@ -9593,6 +9589,11 @@ msgstr "Nem siker�lt az adatok ki�r�sa: %s"
 msgid "Disconnecting from %s"
 msgstr "Sz�tkapcsol�d�s %s kiszolg�l�val"
 
+#: mail/mail-ops.c:2065
+#, fuzzy, c-format
+msgid "Reconnecting to %s"
+msgstr "Sz�tkapcsol�d�s %s kiszolg�l�val"
+
 #: mail/mail-search-dialogue.c:113
 msgid "_Search"
 msgstr "_Keres�s"
@@ -9648,11 +9649,11 @@ msgstr "�tvonal: %s, T�pus: %s"
 msgid "Type: %s"
 msgstr "T�pus: %s"
 
-#: mail/mail-send-recv.c:282
+#: mail/mail-send-recv.c:283
 msgid "Send & Receive Mail"
 msgstr "Levelek k�ld�se �s fogad�sa"
 
-#: mail/mail-send-recv.c:283
+#: mail/mail-send-recv.c:284
 msgid "Cancel All"
 msgstr "Mindent megszak�t"
 
@@ -9672,34 +9673,48 @@ msgstr "Megszak�tva"
 msgid "User canceled operation."
 msgstr "A felhaszn�l� megszak�totta a m�veletet."
 
-#: mail/mail-tools.c:173
+#: mail/mail-tools.c:133
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Nem siker�lt l�trehozni '%s' ideiglenes mbox-ot: %s"
 
-#: mail/mail-tools.c:299
+#: mail/mail-tools.c:259
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Tov�bb�tott �zenet - %s"
 
-#: mail/mail-tools.c:303
+#: mail/mail-tools.c:263
 msgid "Forwarded message"
 msgstr "Tov�bb�tott lev�l"
 
-#: mail/mail-tools.c:439
+#: mail/mail-tools.c:396
 msgid "Forwarded Message"
 msgstr "Tov�bb�tott lev�l"
 
-#: mail/mail-vfolder.c:161
+#: mail/mail-vfolder.c:84
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Vmappa be�ll�t�sa: %s"
 
-#: mail/mail-vfolder.c:435
+#: mail/mail-vfolder.c:201
+#, fuzzy, c-format
+msgid "Updating vfolders for uri: %s"
+msgstr "Mappa m�sol�sa %s-b�l %s-be"
+
+#: mail/mail-vfolder.c:414
+#, c-format
+msgid ""
+"The following vFolder(s):\n"
+"%sUsed the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+
+#: mail/mail-vfolder.c:636
 msgid "VFolders"
 msgstr "VMapp�k"
 
-#: mail/mail-vfolder.c:541
+#: mail/mail-vfolder.c:742
 msgid "New VFolder"
 msgstr "�j VMappa"
 
@@ -9890,44 +9905,44 @@ msgstr "�sszefoglal� a levelekr�l"
 msgid "KBOS:ZSAM:EGAA"
 msgstr "LHBP:LHSY"
 
-#: my-evolution/e-summary-preferences.c:442
+#: my-evolution/e-summary-preferences.c:441
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com -- A nap mond�sa"
 
-#: my-evolution/e-summary-preferences.c:464
+#: my-evolution/e-summary-preferences.c:463
 msgid "Quotes of the Day"
 msgstr "A nap mond�sa"
 
-#: my-evolution/e-summary-preferences.c:905
+#: my-evolution/e-summary-preferences.c:929
 msgid "Add a news feed"
 msgstr "�j h�rforr�s hozz�ad�sa"
 
-#: my-evolution/e-summary-preferences.c:913
+#: my-evolution/e-summary-preferences.c:937
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Add meg a hozz�adand� h�rforr�s URL-j�t"
 
-#: my-evolution/e-summary-preferences.c:917
+#: my-evolution/e-summary-preferences.c:941
 msgid "Name:"
 msgstr "N�v:"
 
-#: my-evolution/e-summary-preferences.c:1455
+#: my-evolution/e-summary-preferences.c:1486
 msgid "Summary Settings"
 msgstr "�sszefoglal� be�ll�t�sai"
 
-#: my-evolution/e-summary-rdf.c:291 my-evolution/e-summary-rdf.c:376
-#: my-evolution/e-summary-rdf.c:409
+#: my-evolution/e-summary-rdf.c:297 my-evolution/e-summary-rdf.c:382
+#: my-evolution/e-summary-rdf.c:415
 msgid "Error downloading RDF"
 msgstr "Hiba az RDF let�lt�se k�zben"
 
-#: my-evolution/e-summary-rdf.c:501
+#: my-evolution/e-summary-rdf.c:507
 msgid "News Feed"
 msgstr "H�rforr�s"
 
-#: my-evolution/e-summary-tasks.c:232
+#: my-evolution/e-summary-tasks.c:238
 msgid "No tasks"
 msgstr "Nincsenek feladatok"
 
-#: my-evolution/e-summary-tasks.c:271
+#: my-evolution/e-summary-tasks.c:277
 msgid "(No Description)"
 msgstr "(Nincs le�r�s)"
 
@@ -11375,25 +11390,25 @@ msgstr "Nem siker�lt mapp�t �nmag�ra m�solni."
 msgid "Cannot move a folder into one of its descendants."
 msgstr "Nem lehet a mapp�t a saj�t almapp�j�ba �thelyezni."
 
-#: shell/e-shell-folder-commands.c:311
+#: shell/e-shell-folder-commands.c:312
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "Add meg a mapp�t, amelybe \"%s\" mapp�t m�solod:"
 
-#: shell/e-shell-folder-commands.c:316
+#: shell/e-shell-folder-commands.c:317
 msgid "Copy folder"
 msgstr "Mappa m�sol�sa"
 
-#: shell/e-shell-folder-commands.c:358
+#: shell/e-shell-folder-commands.c:359
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "Add meg a mapp�t, amelybe \"%s\" mapp�t mozgatod:"
 
-#: shell/e-shell-folder-commands.c:363
+#: shell/e-shell-folder-commands.c:364
 msgid "Move folder"
 msgstr "Mappa �thelyez�se"
 
-#: shell/e-shell-folder-commands.c:389
+#: shell/e-shell-folder-commands.c:390
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -11402,18 +11417,18 @@ msgstr ""
 "Nem siker�lt t�r�lni a mapp�t:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:405
+#: shell/e-shell-folder-commands.c:406
 #, c-format
 msgid "Delete \"%s\""
 msgstr "\"%s\" t�rl�se"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:415
+#: shell/e-shell-folder-commands.c:416
 #, fuzzy, c-format
 msgid "Are you sure you want to remove the \"%s\" folder?"
 msgstr "T�nyleg t�r�lni akarod ezt a mapp�t: '%s'?"
 
-#: shell/e-shell-folder-commands.c:469
+#: shell/e-shell-folder-commands.c:470
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -11422,12 +11437,12 @@ msgstr ""
 "Nem siker�lt �tnevezni a mapp�t:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:502
+#: shell/e-shell-folder-commands.c:503
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "A kijel�lt mapp�k megtekint�se"
 
-#: shell/e-shell-folder-commands.c:505
+#: shell/e-shell-folder-commands.c:506
 msgid "Rename folder"
 msgstr "Mappa �tnevez�se"
 
@@ -11465,7 +11480,7 @@ msgstr "A megadott mappan�v nem j�: %s"
 msgid "Evolution - Create new folder"
 msgstr "Evol�ci� - �j mappa k�sz�t�se"
 
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:99
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -11473,7 +11488,7 @@ msgstr ""
 "A kiv�lasztott mappa t�pusa nem j� a megadott\n"
 "m�velethez."
 
-#: shell/e-shell-folder-selection-dialog.c:348
+#: shell/e-shell-folder-selection-dialog.c:360
 msgid "New..."
 msgstr "�j..."
 
@@ -11481,7 +11496,11 @@ msgstr "�j..."
 msgid "(Untitled)"
 msgstr "(N�vtelen)"
 
-#: shell/e-shell-importer.c:102
+#: shell/e-shell-importer.c:141
+msgid "Choose the type of importer to run"
+msgstr ""
+
+#: shell/e-shell-importer.c:144
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -11495,9 +11514,13 @@ msgstr ""
 "V�laszthatod az \"Automatikus\" lehet�s�get, ha nem tudod a t�pust, az "
 "Evol�ci� megpr�b�lja felismerni."
 
+#: shell/e-shell-importer.c:150
+msgid "Please select the information that you would like to import"
+msgstr ""
+
 #. Importer isn't ready yet.
 #. Wait 5 seconds and try again.
-#: shell/e-shell-importer.c:197
+#: shell/e-shell-importer.c:242
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11508,7 +11531,7 @@ msgstr ""
 "Az import�l� nem felel.\n"
 "Pr�b�lkoz�s 5 m�sodperc m�lva."
 
-#: shell/e-shell-importer.c:217 shell/e-shell-importer.c:248
+#: shell/e-shell-importer.c:262 shell/e-shell-importer.c:293
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11517,16 +11540,16 @@ msgstr ""
 "%s import�l�sa\n"
 "%d. elem import�l�sa."
 
-#: shell/e-shell-importer.c:351
+#: shell/e-shell-importer.c:396
 #, c-format
 msgid "File %s does not exist"
 msgstr "`%s' f�jl nem l�tezik."
 
-#: shell/e-shell-importer.c:363
+#: shell/e-shell-importer.c:408
 msgid "You may only import to local folders"
 msgstr "Csak helyi mapp�kba tudsz import�lni"
 
-#: shell/e-shell-importer.c:378
+#: shell/e-shell-importer.c:423
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -11535,11 +11558,11 @@ msgstr ""
 "Nincs olyan import�l�, amely k�pes lenne kezelni\n"
 "%s-t"
 
-#: shell/e-shell-importer.c:388
+#: shell/e-shell-importer.c:433
 msgid "Importing"
 msgstr "Import�l�s folyamatban"
 
-#: shell/e-shell-importer.c:396
+#: shell/e-shell-importer.c:441
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -11548,17 +11571,17 @@ msgstr ""
 "%s import�l�sa.\n"
 "%s ind�t�sa"
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:454
 #, c-format
 msgid "Error starting %s"
 msgstr "Hiba %s ind�t�sakor"
 
-#: shell/e-shell-importer.c:428
+#: shell/e-shell-importer.c:473
 #, c-format
 msgid "Error loading %s"
 msgstr "Hiba %s bet�lt�sekor"
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:490
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11567,31 +11590,57 @@ msgstr ""
 "%s import�l�sa\n"
 "1. elem import�l�sa."
 
-#: shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:560
 msgid "Automatic"
 msgstr "Automatikus"
 
-#: shell/e-shell-importer.c:566
+#: shell/e-shell-importer.c:611
 msgid "Filename:"
 msgstr "F�jln�v:"
 
-#: shell/e-shell-importer.c:571
+#: shell/e-shell-importer.c:616
 msgid "Select a file"
 msgstr "V�lassz egy f�jlt"
 
-#: shell/e-shell-importer.c:581
+#: shell/e-shell-importer.c:626
 msgid "File type:"
 msgstr "F�jlt�pus:"
 
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:651
+msgid "Import data and settings from older programs"
+msgstr ""
+
+#: shell/e-shell-importer.c:655
+#, fuzzy
+msgid "Import a single file"
+msgstr "F�jlok import�l�sa"
+
+#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:582
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+"V�rj...\n"
+"Megl�v� be�ll�t�sok keres�se"
+
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:585
+msgid "Starting Intelligent Importers"
+msgstr "Az okos import�l�k ind�t�sa"
+
+#: shell/e-shell-importer.c:840 shell/e-shell-startup-wizard.c:703
+#, c-format
+msgid "From %s:"
+msgstr "Felad� %s:"
+
+#: shell/e-shell-importer.c:1003
 msgid "Select folder"
 msgstr "V�lassz mapp�t"
 
-#: shell/e-shell-importer.c:646
+#: shell/e-shell-importer.c:1004
 msgid "Select a destination folder for importing this data"
 msgstr "V�laszd ki az import�l�land� adatok c�lk�nyvt�r�t"
 
-#: shell/e-shell-importer.c:689 shell/importer/intelligent.c:194
+#: shell/e-shell-importer.c:1116 shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "Import�l�s"
 
@@ -11613,46 +11662,29 @@ msgid "Cannot initialize the Evolution Mailer Wizard interface"
 msgstr ""
 "Nem siker�lt inicializ�lni az Evol�ci� Levelez�be�ll�t� Var�zsl� fel�let�t"
 
-#: shell/e-shell-startup-wizard.c:582
-msgid ""
-"Please wait...\n"
-"Scanning for existing setups"
-msgstr ""
-"V�rj...\n"
-"Megl�v� be�ll�t�sok keres�se"
-
-#: shell/e-shell-startup-wizard.c:585
-msgid "Starting Intelligent Importers"
-msgstr "Az okos import�l�k ind�t�sa"
-
-#: shell/e-shell-startup-wizard.c:703
-#, c-format
-msgid "From %s:"
-msgstr "Felad� %s:"
-
 #: shell/e-shell-startup-wizard.c:745
 msgid ""
 "Please select the information\n"
 "that you would like to import"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:199
+#: shell/e-shell-view-menu.c:201
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy nem tal�lhat� a $PATH-odban."
 
-#: shell/e-shell-view-menu.c:207
+#: shell/e-shell-view-menu.c:209
 msgid "Bug buddy could not be run."
 msgstr "Nem siker�lt futtatni a Bug buddy-t."
 
-#: shell/e-shell-view-menu.c:233
+#: shell/e-shell-view-menu.c:235
 msgid "Ximian Evolution"
 msgstr "Ximian Evol�ci�"
 
-#: shell/e-shell-view-menu.c:235
+#: shell/e-shell-view-menu.c:237
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:237
+#: shell/e-shell-view-menu.c:239
 msgid ""
 "Ximian Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -11662,27 +11694,36 @@ msgstr ""
 "levelez�shez, napt�r �s c�mjegyz�k funkci�kkal\n"
 "a GNOME grafikus k�rnyezethez."
 
-#: shell/e-shell-view-menu.c:439
+#: shell/e-shell-view-menu.c:442
 msgid "Go to folder..."
 msgstr "Ugr�s mapp�ba..."
 
-#: shell/e-shell-view-menu.c:440
+#: shell/e-shell-view-menu.c:443
 msgid "Select the folder that you want to open"
 msgstr "V�laszd ki a megnyitand� mapp�t"
 
-#: shell/e-shell-view-menu.c:585
+#: shell/e-shell-view-menu.c:563
 msgid "Create a new shortcut"
 msgstr "�j ind�t�ikon l�trehoz�sa"
 
-#: shell/e-shell-view-menu.c:586
+#: shell/e-shell-view-menu.c:564
 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:700
+#: shell/e-shell-view-menu.c:595
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:603
+#, fuzzy, c-format
+msgid "Error executing %s."
+msgstr "Hiba a sz�r� v�grehajt�sa k�zben: %s: %s"
+
+#: shell/e-shell-view-menu.c:705
 msgid "Work Online"
 msgstr "Munka a h�l�zatban"
 
-#: shell/e-shell-view-menu.c:713 shell/e-shell-view-menu.c:726
+#: shell/e-shell-view-menu.c:718 shell/e-shell-view-menu.c:731
 #: ui/evolution.xml.h:30
 msgid "Work Offline"
 msgstr "Kapcsolat n�lk�li munka"
@@ -11728,12 +11769,12 @@ msgstr ""
 "A Ximian Evol�ci� kapcsolat n�lk�li m�dban van. Kattints erre a gombra a "
 "h�l�zatra csatlakoz�shoz."
 
-#: shell/e-shell.c:560
+#: shell/e-shell.c:562
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Nem siker�lt be�ll�tani a helyi t�rter�letet -- %s"
 
-#: shell/e-shell.c:1496
+#: shell/e-shell.c:1488
 #, c-format
 msgid ""
 "Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
@@ -11742,23 +11783,23 @@ msgstr ""
 "Hopp�! Az '%s' n�zet v�ratlanul meghalt. :-(\n"
 "Ez val�sz�n�leg azt jelenti, hogy a %s komponens �sszeomlott."
 
-#: shell/e-shell.c:1700 widgets/misc/e-cell-date-edit.c:248
+#: shell/e-shell.c:1692 widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "OK"
 
-#: shell/e-shell.c:1702
+#: shell/e-shell.c:1694
 msgid "Invalid arguments"
 msgstr "�rv�nytelen argumentumok"
 
-#: shell/e-shell.c:1704
+#: shell/e-shell.c:1696
 msgid "Cannot register on OAF"
 msgstr "Nem siker�lt regisztr�lni az OAF-ban"
 
-#: shell/e-shell.c:1706
+#: shell/e-shell.c:1698
 msgid "Configuration Database not found"
 msgstr "A be�ll�t�sok adatb�zisa nem tal�lhat�"
 
-#: shell/e-shell.c:1708 shell/e-storage.c:496
+#: shell/e-shell.c:1700 shell/e-storage.c:496
 msgid "Generic error"
 msgstr "�ltal�nos hiba"
 
@@ -12021,14 +12062,26 @@ msgid "Evolution Importer Assistant"
 msgstr "Evol�ci� import�l� var�zsl�"
 
 #: shell/importer/import.glade.h:4
-msgid "Import File (Step 2 of 2)"
+#, fuzzy
+msgid "Import File (step 3 of 3)"
 msgstr "F�jl import�l�sa (2/2 l�p�s)"
 
 #: shell/importer/import.glade.h:5
-msgid "Select a File (step 1 of 2)"
-msgstr "V�lassz egy f�jlt (1/2 l�p�s)"
+#, fuzzy
+msgid "Importer Type (step 1 of 3)"
+msgstr "F�jl import�l�sa (2/2 l�p�s)"
 
 #: shell/importer/import.glade.h:6
+#, fuzzy
+msgid "Select Importers (step 2 of 3)"
+msgstr "V�lassz egy f�jlt (1/2 l�p�s)"
+
+#: shell/importer/import.glade.h:7
+#, fuzzy
+msgid "Select a File (step 2 of 3)"
+msgstr "V�lassz egy f�jlt (1/2 l�p�s)"
+
+#: shell/importer/import.glade.h:8
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of\n"
@@ -12244,13 +12297,6 @@ msgstr "_N�vjegy keres�se"
 msgid "_Select All"
 msgstr "_Mindet kijel�li"
 
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:44
-#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
-#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:19
-#: ui/my-evolution.xml.h:9
-msgid "_Tools"
-msgstr "_Eszk�z�k"
-
 #: ui/evolution-calendar.xml.h:2
 msgid "Configure the calendar's settings"
 msgstr "A napt�r be�ll�t�sai"
@@ -12421,8 +12467,8 @@ 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:49
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:36
 msgid "_File"
 msgstr "_F�jl"
@@ -12443,8 +12489,8 @@ msgstr "A n�vjegy ment�se �s a p�rbesz�dablak bez�r�sa "
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:54
-#: ui/evolution-signature-editor.xml.h:11
+#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Save"
 msgstr "_Ment�s"
 
@@ -13038,6 +13084,11 @@ msgstr "_Szok�sos megjelen�t�s"
 msgid "_Open Message"
 msgstr "Lev�l _megnyit�sa"
 
+#: ui/evolution-mail-message.xml.h:98 ui/evolution.xml.h:49
+#: ui/my-evolution.xml.h:9
+msgid "_Tools"
+msgstr "_Eszk�z�k"
+
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Ablak bez�r�sa"
@@ -13049,8 +13100,8 @@ msgstr "Ablak bez�r�sa"
 msgid "_Close"
 msgstr "_Bez�r�s"
 
-#: ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:48
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:50
 msgid "_View"
 msgstr "_N�zet"
 
@@ -13212,36 +13263,31 @@ msgid "_Cc Field"
 msgstr "_M�solat mez�"
 
 #: ui/evolution-message-composer.xml.h:46
-#: ui/evolution-signature-editor.xml.h:6
-msgid "_Debug"
-msgstr "_Hibak�vet�s"
-
-#: ui/evolution-message-composer.xml.h:47
 msgid "_Delete all"
 msgstr "_Mindet t�rli"
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:49
 msgid "_From Field"
 msgstr "_Felad� mez�"
 
-#: ui/evolution-message-composer.xml.h:51
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-signature-editor.xml.h:9
 msgid "_Insert"
 msgstr "_Beilleszt�s"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:51
 msgid "_Open..."
 msgstr "_Megnyit�s..."
 
-#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Reply-To Field"
 msgstr "_V�laszc�m mez�"
 
-#: ui/evolution-message-composer.xml.h:55
+#: ui/evolution-message-composer.xml.h:54
 msgid "_Security"
 msgstr "_Biztons�g"
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "_S�g�"
 
@@ -13374,8 +13420,8 @@ msgid "Exit the program"
 msgstr "Kil�p�s a programb�l"
 
 #: ui/evolution.xml.h:15
-msgid "Import an external file format"
-msgstr "K�ls� f�jlform�tum import�l�sa"
+msgid "Import data from other programs"
+msgstr ""
 
 #: ui/evolution.xml.h:17
 msgid "Move this folder to another place"
@@ -13446,8 +13492,9 @@ msgid "_Go to Folder..."
 msgstr "Mapp�ra _ugr�s..."
 
 #: ui/evolution.xml.h:41
-msgid "_Import File..."
-msgstr "F�jl _import�l�sa..."
+#, fuzzy
+msgid "_Import..."
+msgstr "Import�l�s folyamatban..."
 
 #: ui/evolution.xml.h:42
 msgid "_Move..."
@@ -13462,18 +13509,23 @@ msgid "_New Folder"
 msgstr "�j _mappa"
 
 #: ui/evolution.xml.h:45
+#, fuzzy
+msgid "_Pilot Settings..."
+msgstr "_Levelez� be�ll�t�sai"
+
+#: ui/evolution.xml.h:46
 msgid "_Rename..."
 msgstr "�_tnevez�s..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:47
 msgid "_Shortcut"
 msgstr "_Ind�t�ikon"
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:48
 msgid "_Shortcut Bar"
 msgstr "_Ind�t�s�v"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:51
 msgid "_Work Offline"
 msgstr "K_apcsolat n�lk�li munka"
 
@@ -13729,6 +13781,24 @@ msgstr "init_corba(): nem siker�lt a GNOME inicializ�l�sa"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 
+#~ msgid "Evolution Shortcuts"
+#~ msgstr "Evol�ci� ind�t�ikonok"
+
+#~ msgid "Message _preview should be displayed by default"
+#~ msgstr "Legyen _betekint� ablakt�bla alap�rtelmez�s szerint"
+
+#~ msgid "Message list should display in a _threaded fashion by default"
+#~ msgstr "A leveleket _sz�lank�nt rendezze alap�rtelmez�s szerint"
+
+#~ msgid "_Debug"
+#~ msgstr "_Hibak�vet�s"
+
+#~ msgid "Import an external file format"
+#~ msgstr "K�ls� f�jlform�tum import�l�sa"
+
+#~ msgid "_Import File..."
+#~ msgstr "F�jl _import�l�sa..."
+
 #, fuzzy
 #~ msgid "_Calendar Information:"
 #~ msgstr "napt�rinform�ci�"
@@ -14603,9 +14673,6 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgid "Moving folder %s to %s"
 #~ msgstr "Mappa mozgat�sa %s-b�l %s-be"
 
-#~ msgid "Copying folder %s to %s"
-#~ msgstr "Mappa m�sol�sa %s-b�l %s-be"
-
 #~ msgid "Find..."
 #~ msgstr "Keres�s..."
 
@@ -15194,9 +15261,6 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgid "Do you accept?"
 #~ msgstr "Elfogadod?"
 
-#~ msgid "Import files"
-#~ msgstr "F�jlok import�l�sa"
-
 #~ msgid "_Compose"
 #~ msgstr "_L�trehoz�s"
 
diff --git a/po/it.po b/po/it.po
index c4cb39ee00..ebd22f8364 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution 0.8\n"
-"POT-Creation-Date: 2001-09-21 18:31-0400\n"
+"POT-Creation-Date: 2001-10-01 19:06-0400\n"
 "PO-Revision-Date: 2001-03-23 10:23-01:00\n"
 "Last-Translator: Clara Tattoni <clara.tattoni@libero.it>\n"
 "Language-Team: Italiano <it@li.org>\n"
@@ -34,294 +34,294 @@ msgid "Name"
 msgstr "Nome"
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#, fuzzy
-msgid "Family Name"
-msgstr "Nome e cognome"
-
-#: addressbook/backend/ebook/e-card-simple.c:61
 #: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Email"
 msgstr "Email"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:61
 #: addressbook/gui/contact-editor/e-contact-editor.c:1609
 msgid "Primary"
 msgstr "Principale"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:61
 #, fuzzy
 msgid "Prim"
 msgstr "Principale"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:92
 #: addressbook/gui/contact-editor/e-contact-editor.c:1594
 #: addressbook/gui/widgets/e-addressbook-view.c:902
 msgid "Assistant"
 msgstr "Assistente"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/gui/contact-editor/e-contact-editor.c:1595
 #: addressbook/gui/contact-editor/e-contact-editor.c:1662
 msgid "Business"
 msgstr "Ufficio"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/backend/ebook/e-card-simple.c:68
 #, fuzzy
 msgid "Bus"
 msgstr "Occupato"
 
-#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/gui/contact-editor/e-contact-editor.c:1598
 msgid "Callback"
 msgstr "Richiamare"
 
-#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/gui/contact-editor/e-contact-editor.c:1600
 msgid "Company"
 msgstr "Ditta"
 
-#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:65
 #, fuzzy
 msgid "Comp"
 msgstr "Copia"
 
-#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:69
 #: addressbook/gui/contact-editor/e-contact-editor.c:1601
 #: addressbook/gui/contact-editor/e-contact-editor.c:1663
 msgid "Home"
 msgstr "Casa"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:67
 #: addressbook/gui/widgets/e-addressbook-view.c:877
 msgid "Organization"
 msgstr "Organizzazione"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:67
 #, fuzzy
 msgid "Org"
 msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/e-contact-editor.c:1605
 msgid "Mobile"
 msgstr "Cellulare"
 
-#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/e-contact-editor.c:1599
 msgid "Car"
 msgstr "Auto"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/e-contact-editor.c:1597
 #: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "Business Fax"
 msgstr "Fax Ufficio"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/backend/ebook/e-card-simple.c:72
 #, fuzzy
 msgid "Bus Fax"
 msgstr "Fax Ufficio"
 
-#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/backend/ebook/e-card-simple.c:73
 #: addressbook/gui/contact-editor/e-contact-editor.c:1603
 #: addressbook/gui/widgets/e-addressbook-view.c:883
 msgid "Home Fax"
 msgstr "Fax Casa"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/e-contact-editor.c:1596
 msgid "Business 2"
 msgstr "Ufficio2"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/backend/ebook/e-card-simple.c:74
 #, fuzzy
 msgid "Bus 2"
 msgstr "Occupato"
 
-#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/backend/ebook/e-card-simple.c:75
 #: addressbook/gui/contact-editor/e-contact-editor.c:1602
 msgid "Home 2"
 msgstr "Casa 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/backend/ebook/e-card-simple.c:76
 #: addressbook/gui/contact-editor/e-contact-editor.c:1604
 #: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/backend/ebook/e-card-simple.c:83
 #: addressbook/gui/contact-editor/e-contact-editor.c:1606
 #: addressbook/gui/contact-editor/e-contact-editor.c:1664
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:52
 msgid "Other"
 msgstr "Altro"
 
-#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/backend/ebook/e-card-simple.c:78
 #: addressbook/gui/contact-editor/e-contact-editor.c:1607
 #: addressbook/gui/widgets/e-addressbook-view.c:888
 msgid "Other Fax"
 msgstr "Altro fax"
 
-#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/gui/contact-editor/e-contact-editor.c:1608
 #: addressbook/gui/widgets/e-addressbook-view.c:889
 msgid "Pager"
 msgstr "Impaginatore"
 
-#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/backend/ebook/e-card-simple.c:80
 #: addressbook/gui/contact-editor/e-contact-editor.c:1610
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/backend/ebook/e-card-simple.c:81
 #: addressbook/gui/contact-editor/e-contact-editor.c:1611
 #: addressbook/gui/widgets/e-addressbook-view.c:891
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/backend/ebook/e-card-simple.c:82
 #: addressbook/gui/widgets/e-addressbook-view.c:892
 #, fuzzy
 msgid "TTY"
 msgstr "TTY/TDD"
 
-#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/backend/ebook/e-card-simple.c:84
 #: addressbook/gui/component/e-address-popup.c:476
 #: addressbook/gui/contact-editor/e-contact-editor.c:1637
 #: addressbook/gui/widgets/e-addressbook-view.c:894
 msgid "Email 2"
 msgstr "Email 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/backend/ebook/e-card-simple.c:85
 #: addressbook/gui/component/e-address-popup.c:486
 #: addressbook/gui/contact-editor/e-contact-editor.c:1638
 #: addressbook/gui/widgets/e-addressbook-view.c:895
 msgid "Email 3"
 msgstr "Email 3"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/widgets/e-addressbook-view.c:896
 msgid "Web Site"
 msgstr "Sito Internet"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:86
 msgid "Url"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/widgets/e-addressbook-view.c:897
 msgid "Department"
 msgstr "Dipartimento"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:87
 msgid "Dep"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/backend/ebook/e-card-simple.c:88
 #: addressbook/gui/widgets/e-addressbook-view.c:898
 msgid "Office"
 msgstr "Ufficio"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/backend/ebook/e-card-simple.c:88
 #, fuzzy
 msgid "Off"
 msgstr "Ufficio"
 
-#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card-simple.c:89
 #: addressbook/gui/widgets/e-addressbook-view.c:899
 msgid "Title"
 msgstr "Posizione"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:90
 #: addressbook/gui/widgets/e-addressbook-view.c:900
 msgid "Profession"
 msgstr "Professione"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Prof"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:91
 #: addressbook/gui/widgets/e-addressbook-view.c:901
 msgid "Manager"
 msgstr "Manager"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:91
 #, fuzzy
 msgid "Man"
 msgstr "Maggio"
 
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:92
 msgid "Ass"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card-simple.c:93
 #: addressbook/gui/widgets/e-addressbook-view.c:903
 msgid "Nickname"
 msgstr "Nickname"
 
-#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card-simple.c:93
 #, fuzzy
 msgid "Nick"
 msgstr "Nickname"
 
-#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/backend/ebook/e-card-simple.c:94
 #: addressbook/gui/widgets/e-addressbook-view.c:904
 msgid "Spouse"
 msgstr "Coniuge"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card-simple.c:95
 #: addressbook/gui/widgets/e-addressbook-view.c:905
 msgid "Note"
 msgstr "Note"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:96
 #, fuzzy
 msgid "Calendar URI"
 msgstr "Calendario"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:96
 msgid "CALUri"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:97
 #: addressbook/gui/widgets/e-addressbook-view.c:906
 msgid "Free-busy URL"
 msgstr "Free-busy URL"
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:97
 msgid "FBUrl"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:98
 #, fuzzy
 msgid "Anniversary"
 msgstr "Anni_versario:"
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "Anniv"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card-simple.c:99
 #, fuzzy
 msgid "Birth Date"
 msgstr ""
 "\n"
 "Data di nascita:"
 
-#: addressbook/backend/ebook/e-card-simple.c:103
+#: addressbook/backend/ebook/e-card-simple.c:102
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "Categorie"
 
+#: addressbook/backend/ebook/e-card-simple.c:103
+#, fuzzy
+msgid "Family Name"
+msgstr "Nome e cognome"
+
 #: addressbook/backend/ebook/e-card.c:3564
 msgid "Card: "
 msgstr "Tessera:"
@@ -620,10 +620,10 @@ msgstr "Inserire la password per %s"
 #: 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:1119
+#: addressbook/conduit/address-conduit.c:1167
 #: addressbook/gui/component/addressbook-factory.c:48
-#: calendar/conduits/calendar/calendar-conduit.c:1204
-#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/conduits/calendar/calendar-conduit.c:1262
+#: calendar/conduits/todo/todo-conduit.c:1034
 #: calendar/gui/alarm-notify/notify-main.c:78 calendar/gui/main.c:63
 msgid "Could not initialize Bonobo"
 msgstr "Impossibile inizializzare Bonobo"
@@ -693,20 +693,20 @@ msgstr "Il cursore non pu� essere caricato\n"
 msgid "EBook not loaded\n"
 msgstr "EBook non caricato\n"
 
-#: addressbook/conduit/address-conduit.c:681
-#: calendar/conduits/calendar/calendar-conduit.c:778
-#: calendar/conduits/todo/todo-conduit.c:592
+#: addressbook/conduit/address-conduit.c:731
+#: calendar/conduits/calendar/calendar-conduit.c:837
+#: calendar/conduits/todo/todo-conduit.c:609
 msgid "Could not start wombat server"
 msgstr "Impossibile avviare il server wombat"
 
-#: addressbook/conduit/address-conduit.c:682
-#: calendar/conduits/calendar/calendar-conduit.c:779
-#: calendar/conduits/todo/todo-conduit.c:593
+#: addressbook/conduit/address-conduit.c:732
+#: calendar/conduits/calendar/calendar-conduit.c:838
+#: calendar/conduits/todo/todo-conduit.c:610
 msgid "Could not start wombat"
 msgstr "Impossibile avviare wombat"
 
-#: addressbook/conduit/address-conduit.c:714
-#: addressbook/conduit/address-conduit.c:717
+#: addressbook/conduit/address-conduit.c:762
+#: addressbook/conduit/address-conduit.c:765
 msgid "Could not read pilot's Address application block"
 msgstr "Impossibile leggere il blocco Indirizzi del Pilot"
 
@@ -753,8 +753,8 @@ msgid "Factory for the sample Addressbook control"
 msgstr "Fabbrica per il controllo degli esempi della Rubrica"
 
 #: addressbook/gui/component/addressbook-component.c:66
-#: calendar/gui/dialogs/comp-editor-util.c:281
-#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:173
+#: calendar/gui/dialogs/comp-editor-util.c:289
+#: calendar/gui/dialogs/comp-editor-util.c:345 shell/e-local-storage.c:173
 #: shell/e-shortcuts.c:1062
 #, fuzzy
 msgid "Contacts"
@@ -778,23 +778,23 @@ msgstr ""
 "Errore nel caricare le informazioni dei filtri:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-component.c:386
+#: addressbook/gui/component/addressbook-component.c:411
 #: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "New Contact"
 msgstr "Nuovo contatto"
 
-#: addressbook/gui/component/addressbook-component.c:386
+#: addressbook/gui/component/addressbook-component.c:411
 #, fuzzy
 msgid "New _Contact"
 msgstr "Nuovo contatto"
 
-#: addressbook/gui/component/addressbook-component.c:387
+#: addressbook/gui/component/addressbook-component.c:412
 #, fuzzy
 msgid "New Contact List"
 msgstr "Nuovo contatto"
 
-#: addressbook/gui/component/addressbook-component.c:387
+#: addressbook/gui/component/addressbook-component.c:412
 #, fuzzy
 msgid "New Contact _List"
 msgstr "Nuovo contatto"
@@ -904,19 +904,19 @@ msgid "_Account name:"
 msgstr "Gestione degli Account"
 
 #: addressbook/gui/component/addressbook-config.glade.h:22
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: 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:90 my-evolution/my-evolution.glade.h:20
+#: mail/mail-config.glade.h:91 my-evolution/my-evolution.glade.h:20
 msgid "_Add"
 msgstr "_Aggiungi"
 
 #: addressbook/gui/component/addressbook-config.glade.h:23
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:95
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:96
 #: ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
 #: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
 msgstr "_Modifica"
@@ -940,37 +940,37 @@ msgstr "Salva Messaggio con nome..."
 msgid "Other Contacts"
 msgstr "Altri Contatti"
 
-#: addressbook/gui/component/addressbook.c:393
+#: addressbook/gui/component/addressbook.c:407
 #, fuzzy, c-format
 msgid "Please enter your email address and password for access to %s"
 msgstr "Digitare la %s passphrase per %s"
 
-#: addressbook/gui/component/addressbook.c:401
+#: addressbook/gui/component/addressbook.c:415
 #, fuzzy
 msgid "LDAP Authentication"
 msgstr "Autenticazione"
 
-#: addressbook/gui/component/addressbook.c:412
+#: addressbook/gui/component/addressbook.c:426
 msgid "Email Address:"
 msgstr "Indirizzo Email:"
 
-#: addressbook/gui/component/addressbook.c:425
+#: addressbook/gui/component/addressbook.c:439
 #, fuzzy
 msgid "Password:"
 msgstr "Password"
 
-#: addressbook/gui/component/addressbook.c:488
+#: addressbook/gui/component/addressbook.c:502
 msgid "Unable to open addressbook"
 msgstr "Impossibile aprire la rubruca"
 
-#: addressbook/gui/component/addressbook.c:495
+#: addressbook/gui/component/addressbook.c:509
 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:500
+#: addressbook/gui/component/addressbook.c:514
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -978,45 +978,45 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:508
+#: addressbook/gui/component/addressbook.c:522
 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:649
+#: addressbook/gui/component/addressbook.c:663
 #: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "Qualunque campo contiene"
 
-#: addressbook/gui/component/addressbook.c:650
+#: addressbook/gui/component/addressbook.c:664
 msgid "Name contains"
 msgstr "Il nome contiene"
 
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:665
 msgid "Email contains"
 msgstr "Email contiene"
 
-#: addressbook/gui/component/addressbook.c:652
+#: addressbook/gui/component/addressbook.c:666
 #: calendar/gui/cal-search-bar.c:59
 #, fuzzy
 msgid "Category is"
 msgstr "Categorie"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:653 widgets/misc/e-filter-bar.h:97
+#: addressbook/gui/component/addressbook.c:667 widgets/misc/e-filter-bar.h:97
 #: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "Avanzato..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:883
+#: addressbook/gui/component/addressbook.c:897
 #: calendar/gui/cal-search-bar.c:412
 #, fuzzy
 msgid "Any Category"
 msgstr "Categoria:"
 
-#: addressbook/gui/component/addressbook.c:925
+#: addressbook/gui/component/addressbook.c:939
 msgid "The URI that the Folder Browser will display"
 msgstr "La URI visualizzata dal Browser delle cartelle"
 
@@ -1031,7 +1031,7 @@ msgid "(none)"
 msgstr "(Senza nome)"
 
 #: addressbook/gui/component/e-address-popup.c:466
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #: addressbook/gui/contact-editor/e-contact-editor.c:1636
 msgid "Primary Email"
 msgstr "Email principale"
@@ -1211,120 +1211,127 @@ msgstr "Dettagli"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
 #, fuzzy
+msgid "F_ree/Busy URL:"
+msgstr "Free-busy URL"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#, fuzzy
 msgid "File A_s:"
 msgstr "Memorizza Come:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "General"
 msgstr "Generale"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+msgid ""
+"If this person publishes free/busy or other calendar information on the "
+"Internet, enter the address\n"
+"of that information here."
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "New phone type"
 msgstr "Nuovo tipo di telefono"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "No_tes:"
 msgstr "No_te:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #, fuzzy
 msgid "Organi_zation:"
 msgstr "Organizzazione:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "Phone Types"
 msgstr "Tipi di Telefono"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "Wants to receive _HTML mail"
 msgstr "Vuole ricevere messaggi in _HTML"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Address..."
 msgstr "_Indirizzo..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "_Assistant's name:"
 msgstr "Nome dell'_Assistente:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Birthday:"
 msgstr "Co_mpleanno:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Business"
 msgstr "_Ufficio"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#, fuzzy
-msgid "_Calendar Information:"
-msgstr "informazioni sul calendario"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 #: calendar/gui/dialogs/event-page.glade.h:12
 #: calendar/gui/dialogs/task-page.glade.h:10
 msgid "_Contacts..."
 msgstr "_Contatti..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:834 filter/filter.glade.h:8
-#: mail/folder-browser.c:1371 mail/mail-config.glade.h:94
+#: mail/folder-browser.c:1406 mail/mail-config.glade.h:95
 #: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "_Elimina"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Department:"
 msgstr "_Dipartimento:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#, fuzzy
-msgid "_Free/Busy Information:"
-msgstr "Informazioni Utente"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Full Name..."
 msgstr "_Nome e Cognome..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Home"
 msgstr "_Casa"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Job title:"
 msgstr "_Titolo:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Manager's Name:"
 msgstr "Nome del _Manager:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Mobile"
 msgstr "C_ellulare"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Nickname:"
 msgstr "_Nickname:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Office:"
 msgstr "_Ufficio:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Profession:"
 msgstr "_Professione:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#, fuzzy
+msgid "_Public Calendar URL:"
+msgstr "Calendario"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Spouse:"
 msgstr "_Coniuge:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_This is the mailing address"
 msgstr "Indirizzo a cui _spedire"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "_Web page address:"
 msgstr "Indirizzo pagina web:"
@@ -2585,7 +2592,7 @@ msgstr " %d secondi"
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
 #: addressbook/gui/widgets/e-addressbook-view.c:691
 #: addressbook/gui/widgets/e-addressbook-view.c:753
-#: addressbook/gui/widgets/e-addressbook-view.c:1373
+#: addressbook/gui/widgets/e-addressbook-view.c:1422
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Salva come VCard"
@@ -2644,8 +2651,8 @@ msgid "Success"
 msgstr "Sorgenti"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1710
-#: shell/e-storage.c:515
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1702
+#: shell/e-storage.c:520
 msgid "Unknown error"
 msgstr "Errore sconosciuto"
 
@@ -2654,7 +2661,7 @@ msgstr "Errore sconosciuto"
 msgid "Repository offline"
 msgstr "Non collegato"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:505
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:510
 msgid "Permission denied"
 msgstr "Permesso negato"
 
@@ -2673,10 +2680,10 @@ msgid "Protocol not supported"
 msgstr "Operazione non supportata"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:733 calendar/gui/calendar-model.c:1274
+#: calendar/gui/calendar-model.c:726 calendar/gui/calendar-model.c:1247
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:544
-#: camel/camel-service.c:580
+#: calendar/gui/e-calendar-table.c:461 camel/camel-service.c:598
+#: camel/camel-service.c:634
 msgid "Cancelled"
 msgstr "Annullato"
 
@@ -2706,7 +2713,7 @@ msgid "Error removing list"
 msgstr "Errore nel caricare: %s"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1248
+#: addressbook/gui/widgets/e-addressbook-view.c:1297
 #, fuzzy
 msgid "Error removing card"
 msgstr ""
@@ -2998,8 +3005,8 @@ msgstr "Carattere..."
 msgid "Print cards"
 msgstr "Stampa calendario"
 
-#: addressbook/printing/e-contact-print.c:1112
-#: addressbook/printing/e-contact-print.c:1134
+#: addressbook/printing/e-contact-print.c:1152
+#: addressbook/printing/e-contact-print.c:1174
 #, fuzzy
 msgid "Print card"
 msgstr "Stampa calendario"
@@ -3010,18 +3017,44 @@ msgstr "Stampa calendario"
 msgid "Print envelope"
 msgstr "Stampa _Busta..."
 
-#: calendar/conduits/calendar/calendar-conduit.c:735
-#: calendar/conduits/todo/todo-conduit.c:548
+#: calendar/cal-util/cal-util.c:418 calendar/cal-util/cal-util.c:440
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:385 mail/message-list.c:652
+msgid "High"
+msgstr "Altezza"
+
+#: calendar/cal-util/cal-util.c:420 calendar/cal-util/cal-util.c:442
+#: calendar/gui/calendar-model.c:1673
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:386 mail/message-list.c:651
+msgid "Normal"
+msgstr "Normale"
+
+#: calendar/cal-util/cal-util.c:422 calendar/cal-util/cal-util.c:444
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:387 mail/message-list.c:650
+msgid "Low"
+msgstr "Basso"
+
+#. An empty string is the same as 'None'.
+#: calendar/cal-util/cal-util.c:438
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:388
+msgid "Undefined"
+msgstr "Non definito"
+
+#: calendar/conduits/calendar/calendar-conduit.c:793
+#: calendar/conduits/todo/todo-conduit.c:564
 msgid "Error while communicating with calendar server"
 msgstr "Errore durante la comunicazione con il server del calendario"
 
-#: calendar/conduits/calendar/calendar-conduit.c:839
-#: calendar/conduits/calendar/calendar-conduit.c:842
+#: calendar/conduits/calendar/calendar-conduit.c:896
+#: calendar/conduits/calendar/calendar-conduit.c:899
 msgid "Could not read pilot's Calendar application block"
 msgstr "Impossibile leggere il blocco di applicazione del Calendario"
 
-#: calendar/conduits/todo/todo-conduit.c:653
-#: calendar/conduits/todo/todo-conduit.c:656
+#: calendar/conduits/todo/todo-conduit.c:668
+#: calendar/conduits/todo/todo-conduit.c:671
 msgid "Could not read pilot's ToDo application block"
 msgstr "Impossibile leggere il blocco delle applicazioni da fare del Pilot "
 
@@ -3071,47 +3104,47 @@ msgstr "Servizio di notifica dell'avviso sonoro"
 msgid "Factory for the alarm notification service"
 msgstr "Fabbrica per il servizio di notifica dell'avviso sonoro"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:152
 #, fuzzy, c-format
 msgid "Notification about your appointment starting on %s and ending on %s"
 msgstr "Avviso dell'appuntamento alle:%A %b %d %Y %H:%M"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:156
 #, fuzzy, c-format
 msgid "Notification about your appointment starting on %s"
 msgstr "Avviso dell'appuntamento alle:%A %b %d %Y %H:%M"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:161
 #, fuzzy, c-format
 msgid "Notification about your appointment ending on %s"
 msgstr "Avviso dell'appuntamento alle:%A %b %d %Y %H:%M"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:165
 #, fuzzy
 msgid "Notification about your appointment"
 msgstr "Avviso dell'appuntamento alle:%A %b %d %Y %H:%M"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:172
 #, fuzzy, c-format
 msgid "Notification about your task starting on %s and ending on %s"
 msgstr "Avviso dell'appuntamento alle:%A %b %d %Y %H:%M"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:176
 #, fuzzy, c-format
 msgid "Notification about your task starting on %s"
 msgstr "Avviso dell'appuntamento alle:%A %b %d %Y %H:%M"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:181
 #, fuzzy, c-format
 msgid "Notification about your task ending on %s"
 msgstr "Avviso dell'appuntamento alle:%A %b %d %Y %H:%M"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:185
 #, fuzzy
 msgid "Notification about your task"
 msgstr "Mostra informazioni su Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:267
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "Avviso alle %A %b %d %Y %H:%M"
 
@@ -3201,7 +3234,7 @@ msgstr "%A, %e %B %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: calendar/gui/calendar-commands.c:467
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1442
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1446
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -3212,17 +3245,17 @@ msgstr ""
 "Impossibile creare la vista del calendario.  Controllare le impostazioni di "
 "ORBit e di OAF"
 
-#: calendar/gui/calendar-model.c:399 calendar/gui/calendar-model.c:1001
-#: calendar/gui/e-calendar-table.c:307
+#: calendar/gui/calendar-model.c:399 calendar/gui/calendar-model.c:994
+#: calendar/gui/e-calendar-table.c:364
 msgid "Private"
 msgstr "Privato"
 
-#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:1003
-#: calendar/gui/e-calendar-table.c:308
+#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:996
+#: calendar/gui/e-calendar-table.c:365
 msgid "Confidential"
 msgstr "Confidenziale"
 
-#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:306
+#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:363
 msgid "Public"
 msgstr "Pubblico"
 
@@ -3242,68 +3275,49 @@ msgstr "E"
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:538 calendar/gui/calendar-model.c:1183
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:652
-msgid "High"
-msgstr "Altezza"
-
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1185
-#: calendar/gui/calendar-model.c:1700
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:651
-msgid "Normal"
-msgstr "Normale"
-
-#: calendar/gui/calendar-model.c:542 calendar/gui/calendar-model.c:1187
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:650
-msgid "Low"
-msgstr "Basso"
-
-#: calendar/gui/calendar-model.c:573 calendar/gui/calendar-model.c:1220
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/calendar-model.c:566 calendar/gui/calendar-model.c:1193
+#: calendar/gui/e-calendar-table.c:437
 #, fuzzy
 msgid "Free"
 msgstr "settimana"
 
-#: calendar/gui/calendar-model.c:575 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/calendar-model.c:568 calendar/gui/e-calendar-table.c:438
 #: calendar/gui/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr "Occupato"
 
-#: calendar/gui/calendar-model.c:724 calendar/gui/calendar-model.c:1268
+#: calendar/gui/calendar-model.c:717 calendar/gui/calendar-model.c:1241
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:401
+#: calendar/gui/e-calendar-table.c:458
 msgid "Not Started"
 msgstr "Da cominciare"
 
-#: calendar/gui/calendar-model.c:727 calendar/gui/calendar-model.c:1270
+#: calendar/gui/calendar-model.c:720 calendar/gui/calendar-model.c:1243
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:402
+#: calendar/gui/e-calendar-table.c:459
 msgid "In Progress"
 msgstr "In corso"
 
-#: calendar/gui/calendar-model.c:730 calendar/gui/calendar-model.c:1272
+#: calendar/gui/calendar-model.c:723 calendar/gui/calendar-model.c:1245
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-meeting-model.c:298
+#: calendar/gui/e-calendar-table.c:460 calendar/gui/e-meeting-model.c:298
 #: calendar/gui/e-meeting-model.c:321
 msgid "Completed"
 msgstr "Completato"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:915 e-util/e-time-utils.c:163
+#: calendar/gui/calendar-model.c:908 e-util/e-time-utils.c:163
 #: e-util/e-time-utils.c:354
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:918 e-util/e-time-utils.c:158
+#: calendar/gui/calendar-model.c:911 e-util/e-time-utils.c:158
 #: e-util/e-time-utils.c:363
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:923
+#: calendar/gui/calendar-model.c:916
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -3314,7 +3328,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:1087
+#: calendar/gui/calendar-model.c:1080
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3324,48 +3338,36 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1127
+#: calendar/gui/calendar-model.c:1120
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Il valore percentuale deve essere compreso tra 0 e 100, inclusi"
 
-#: calendar/gui/calendar-model.c:1168
-msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
-msgstr ""
-"la priorit� dev'essere 'Alta', 'Normale', 'Bassa' oppure 'Non definita.'"
-
-#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1181
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:331
-msgid "Undefined"
-msgstr "Non definito"
-
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1266 calendar/gui/dialogs/meeting-page.c:332
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1444
+#: calendar/gui/calendar-model.c:1239 calendar/gui/dialogs/meeting-page.c:332
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1446
 #: mail/mail-accounts.c:143 mail/mail-accounts.c:390
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:50
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:203
-#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
-#: widgets/misc/e-dateedit.c:1428 widgets/misc/e-dateedit.c:1543
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:453
+#: widgets/misc/e-dateedit.c:1453 widgets/misc/e-dateedit.c:1568
 msgid "None"
 msgstr "Nessuno "
 
-#: calendar/gui/calendar-model.c:1702
+#: calendar/gui/calendar-model.c:1675
 msgid "Recurring"
 msgstr "Ricorre"
 
-#: calendar/gui/calendar-model.c:1704
+#: calendar/gui/calendar-model.c:1677
 msgid "Assigned"
 msgstr "Assegnato"
 
-#: calendar/gui/calendar-model.c:1710 calendar/gui/e-meeting-model.c:270
+#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:270
 #: calendar/gui/e-meeting-model.c:280 calendar/gui/e-meeting-model.c:506
 #: calendar/gui/e-meeting-model.c:702
 msgid "Yes"
 msgstr "S�"
 
-#: calendar/gui/calendar-model.c:1710 calendar/gui/e-meeting-model.c:282
+#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:282
 #: calendar/gui/e-meeting-model.c:703
 msgid "No"
 msgstr "No"
@@ -3409,42 +3411,42 @@ msgstr "Il nome contiene"
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/component-factory.c:62 my-evolution/my-evolution.glade.h:6
+#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:6
 #: shell/e-local-storage.c:172 shell/e-shortcuts.c:1056
 msgid "Calendar"
 msgstr "Calendario"
 
-#: calendar/gui/component-factory.c:63
+#: calendar/gui/component-factory.c:64
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/component-factory.c:67 calendar/gui/print.c:1719
-#: my-evolution/e-summary-tasks.c:215 my-evolution/e-summary-tasks.c:231
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1723
+#: my-evolution/e-summary-tasks.c:237 my-evolution/e-summary-tasks.c:253
 #: shell/e-local-storage.c:178 shell/e-shortcuts.c:1059
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Obiettivi"
 
-#: calendar/gui/component-factory.c:68
+#: calendar/gui/component-factory.c:69
 #, fuzzy
 msgid "Folder containing to-do items"
 msgstr "Cartella virtuale sulla Mailng List"
 
-#: calendar/gui/component-factory.c:593 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:581 ui/evolution-calendar.xml.h:7
 msgid "Create a new appointment"
 msgstr "Crea un nuovo appuntamento"
 
-#: calendar/gui/component-factory.c:594 calendar/gui/e-day-view.c:3420
+#: calendar/gui/component-factory.c:582 calendar/gui/e-day-view.c:3422
 #, fuzzy
 msgid "New _Appointment"
 msgstr "Nuovo Appuntamento"
 
-#: calendar/gui/component-factory.c:599 ui/evolution-calendar.xml.h:8
+#: calendar/gui/component-factory.c:587 ui/evolution-calendar.xml.h:8
 #: ui/evolution-tasks.xml.h:5
 msgid "Create a new task"
 msgstr "Crea un nuovo obiettivo"
 
-#: calendar/gui/component-factory.c:600
+#: calendar/gui/component-factory.c:588
 #, fuzzy
 msgid "New _Task"
 msgstr "Nuovo Obiettivo"
@@ -3526,105 +3528,126 @@ msgstr "Ore"
 msgid "minutes"
 msgstr "minuti"
 
-#: calendar/gui/dialogs/alarm-page.c:303
+#: calendar/gui/dialogs/alarm-page.c:307
 #, fuzzy, c-format
 msgid "%d days"
 msgstr " %d giorni"
 
-#: calendar/gui/dialogs/alarm-page.c:305
+#: calendar/gui/dialogs/alarm-page.c:310
 #, fuzzy
 msgid "1 day"
 msgstr " 1 giorno"
 
-#: calendar/gui/dialogs/alarm-page.c:308
+#: calendar/gui/dialogs/alarm-page.c:315
 #, fuzzy, c-format
 msgid "%d weeks"
 msgstr " %d settimane"
 
-#: calendar/gui/dialogs/alarm-page.c:310
+#: calendar/gui/dialogs/alarm-page.c:318
 #, fuzzy
 msgid "1 week"
 msgstr " 1 settimana"
 
-#: calendar/gui/dialogs/alarm-page.c:313
+#: calendar/gui/dialogs/alarm-page.c:323
 #, fuzzy, c-format
 msgid "%d hours"
 msgstr " %d ore"
 
-#: calendar/gui/dialogs/alarm-page.c:315
+#: calendar/gui/dialogs/alarm-page.c:326
 #, fuzzy
 msgid "1 hour"
 msgstr " 1 ora"
 
-#: calendar/gui/dialogs/alarm-page.c:318
+#: calendar/gui/dialogs/alarm-page.c:331
 #, fuzzy, c-format
 msgid "%d minutes"
 msgstr " %d minuti"
 
-#: calendar/gui/dialogs/alarm-page.c:320
+#: calendar/gui/dialogs/alarm-page.c:334
 #, fuzzy
 msgid "1 minute"
 msgstr " 1 minuto"
 
-#: calendar/gui/dialogs/alarm-page.c:323
+#: calendar/gui/dialogs/alarm-page.c:339
 #, fuzzy, c-format
 msgid "%d seconds"
 msgstr " %d secondi"
 
-#: calendar/gui/dialogs/alarm-page.c:325
+#: calendar/gui/dialogs/alarm-page.c:342
 #, fuzzy
 msgid "1 second"
 msgstr " 1 secondo"
 
-#: calendar/gui/dialogs/alarm-page.c:350
+#: calendar/gui/dialogs/alarm-page.c:373
 #: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "Emetti un suono"
 
-#: calendar/gui/dialogs/alarm-page.c:354
+#: calendar/gui/dialogs/alarm-page.c:377
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 #, fuzzy
 msgid "Display a message"
 msgstr "Visualizza tutti gli header del messaggio"
 
-#: calendar/gui/dialogs/alarm-page.c:358
+#: calendar/gui/dialogs/alarm-page.c:381
 msgid "Send an email"
 msgstr "Invia un email"
 
-#: calendar/gui/dialogs/alarm-page.c:362
+#: calendar/gui/dialogs/alarm-page.c:385
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "Esegui programma"
 
-#: calendar/gui/dialogs/alarm-page.c:368 calendar/gui/dialogs/alarm-page.c:404
-#: calendar/gui/e-meeting-model.c:226 calendar/gui/e-meeting-model.c:261
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:674
-#: calendar/gui/e-meeting-model.c:690
-#: camel/providers/smtp/camel-smtp-transport.c:224
-#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
-msgid "Unknown"
-msgstr "Sconosciuto"
-
-#: calendar/gui/dialogs/alarm-page.c:380
+#: calendar/gui/dialogs/alarm-page.c:391
 #, fuzzy
-msgid "before start of appointment"
+msgid "Unknown action to be performed"
+msgstr "Errore sconosciuto"
+
+#: calendar/gui/dialogs/alarm-page.c:403
+#, fuzzy, c-format
+msgid "%s %s before the start of the appointment"
 msgstr " prima dell'inizio di un appuntamento"
 
-#: calendar/gui/dialogs/alarm-page.c:383
-#, fuzzy
-msgid "after start of appointment"
-msgstr " dopo l'inizio di un appuntamento"
+#: calendar/gui/dialogs/alarm-page.c:406
+#, fuzzy, c-format
+msgid "%s %s after the start of the appointment"
+msgstr " prima dell'inizio di un appuntamento"
 
-#: calendar/gui/dialogs/alarm-page.c:393
-#, fuzzy
-msgid "before end of appointment"
-msgstr " prima della fine di un appuntamento"
+#: calendar/gui/dialogs/alarm-page.c:411
+#, fuzzy, c-format
+msgid "%s at the start of the appointment"
+msgstr " prima dell'inizio di un appuntamento"
 
-#: calendar/gui/dialogs/alarm-page.c:396
-#, fuzzy
-msgid "after end of appointment"
+#: calendar/gui/dialogs/alarm-page.c:420
+#, fuzzy, c-format
+msgid "%s %s before the end of the appointment"
+msgstr " prima dell'inizio di un appuntamento"
+
+#: calendar/gui/dialogs/alarm-page.c:423
+#, fuzzy, c-format
+msgid "%s %s after the end of the appointment"
 msgstr " dopo la fine di un appuntamento"
 
+#: calendar/gui/dialogs/alarm-page.c:428
+#, fuzzy, c-format
+msgid "%s at the end of the appointment"
+msgstr " dopo la fine di un appuntamento"
+
+#: calendar/gui/dialogs/alarm-page.c:439
+#, fuzzy, c-format
+msgid "%s at an unknown time"
+msgstr "Errore sconosciuto"
+
+#: calendar/gui/dialogs/alarm-page.c:445
+#, fuzzy, c-format
+msgid "%s at %s"
+msgstr "%s server %s"
+
+#: calendar/gui/dialogs/alarm-page.c:452
+#, c-format
+msgid "%s for an unknown trigger type"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 #, fuzzy
@@ -3979,58 +4002,58 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:159 calendar/gui/print.c:2128
+#: calendar/gui/dialogs/comp-editor-util.c:167 calendar/gui/print.c:2132
 msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:163 calendar/gui/print.c:2132
+#: calendar/gui/dialogs/comp-editor-util.c:171 calendar/gui/print.c:2136
 #, fuzzy
 msgid " (Completed "
 msgstr "Completato"
 
-#: calendar/gui/dialogs/comp-editor-util.c:165 calendar/gui/print.c:2134
+#: calendar/gui/dialogs/comp-editor-util.c:173 calendar/gui/print.c:2138
 #, fuzzy
 msgid "Completed "
 msgstr "Completato"
 
-#: calendar/gui/dialogs/comp-editor-util.c:170 calendar/gui/print.c:2139
+#: calendar/gui/dialogs/comp-editor-util.c:178 calendar/gui/print.c:2143
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2141
+#: calendar/gui/dialogs/comp-editor-util.c:180 calendar/gui/print.c:2145
 #, fuzzy
 msgid "Due "
 msgstr "Scadenza"
 
-#: calendar/gui/dialogs/comp-editor.c:515
+#: calendar/gui/dialogs/comp-editor.c:521
 msgid "Edit Appointment"
 msgstr "Modifica Appuntamenti"
 
-#: calendar/gui/dialogs/comp-editor.c:520
+#: calendar/gui/dialogs/comp-editor.c:526
 #, c-format
 msgid "Appointment - %s"
 msgstr "Appuntamento - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:523
+#: calendar/gui/dialogs/comp-editor.c:529
 #, c-format
 msgid "Task - %s"
 msgstr "Obiettivo - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:526
+#: calendar/gui/dialogs/comp-editor.c:532
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Voce nell'agenda - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:540
+#: calendar/gui/dialogs/comp-editor.c:546
 msgid "No summary"
 msgstr "Niente indice"
 
-#: calendar/gui/dialogs/comp-editor.c:950 mail/mail-callbacks.c:1662
+#: calendar/gui/dialogs/comp-editor.c:952 mail/mail-callbacks.c:1671
 #: mail/mail-display.c:100
 msgid "Overwrite file?"
 msgstr "Sovrascrivere il file?"
 
-#: calendar/gui/dialogs/comp-editor.c:954 mail/mail-callbacks.c:1668
+#: calendar/gui/dialogs/comp-editor.c:956 mail/mail-callbacks.c:1677
 #: mail/mail-display.c:104
 msgid ""
 "A file by that name already exists.\n"
@@ -4039,53 +4062,53 @@ msgstr ""
 "Esiste gi� un file con questo nome.\n"
 "Sovrascriverlo?"
 
-#: calendar/gui/dialogs/comp-editor.c:1017 ui/evolution-comp-editor.xml.h:13
+#: calendar/gui/dialogs/comp-editor.c:1019 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "Salva con nome..."
 
-#: calendar/gui/dialogs/comp-editor.c:1170
+#: calendar/gui/dialogs/comp-editor.c:1172
 msgid "Unable to obtain current version!"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:90
+#: calendar/gui/dialogs/delete-comp.c:91
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Sei sicuro di voler cancellare l'appuntamento `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:93
+#: calendar/gui/dialogs/delete-comp.c:94
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Sei sicuro di voler cancellare questo appuntamento senza nome?"
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:100
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Sei sicuro di voler cancellare l'obiettivo `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:102
+#: calendar/gui/dialogs/delete-comp.c:103
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Sei sicuro di voler cancellare quest'obiettivo senxa nome?"
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:109
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Sei sicuro di voler cancellare la voce dell'agenda `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:111
+#: calendar/gui/dialogs/delete-comp.c:112
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Sei sicuro di voler cancellare questa voce dell'agenda senza nome?"
 
-#: calendar/gui/dialogs/delete-comp.c:126
+#: calendar/gui/dialogs/delete-comp.c:127
 #, fuzzy, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Sei sicuro di voler cancellare l'appuntamento `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:131
+#: calendar/gui/dialogs/delete-comp.c:132
 #, fuzzy, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Sei sicuro di voler cancellare l'obiettivo `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:136
+#: calendar/gui/dialogs/delete-comp.c:137
 #, fuzzy, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Sei sicuro di voler cancellare la voce dell'agenda `%s'?"
@@ -4286,7 +4309,7 @@ msgstr "Status"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:18
-#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:85
+#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:86
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Tipo"
@@ -4311,8 +4334,8 @@ msgstr "_Invita altri..."
 msgid "_Other Organizer"
 msgstr "Organizzatore:"
 
-#: calendar/gui/dialogs/recurrence-page.c:422 calendar/gui/print.c:1851
-#: calendar/gui/print.c:1853 calendar/gui/print.c:1854
+#: calendar/gui/dialogs/recurrence-page.c:422 calendar/gui/print.c:1855
+#: calendar/gui/print.c:1857 calendar/gui/print.c:1858
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
@@ -4437,7 +4460,7 @@ msgid "Progress"
 msgstr "In corso"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:910
+#: my-evolution/e-summary-preferences.c:949
 msgid "URL:"
 msgstr "URL:"
 
@@ -4457,7 +4480,7 @@ msgstr "Assegnato"
 
 #: calendar/gui/dialogs/task-page.glade.h:4
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:28
 msgid "Description:"
 msgstr "Descrizione:"
 
@@ -4473,110 +4496,110 @@ msgstr "_Confidenziale"
 msgid "_Due Date:"
 msgstr "Sca_denza:"
 
-#: calendar/gui/e-calendar-table.c:350
+#: calendar/gui/e-calendar-table.c:407
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:351
+#: calendar/gui/e-calendar-table.c:408
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:409
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:410
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:411
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:412
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:356
+#: calendar/gui/e-calendar-table.c:413
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:357
+#: calendar/gui/e-calendar-table.c:414
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:358
+#: calendar/gui/e-calendar-table.c:415
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:359
+#: calendar/gui/e-calendar-table.c:416
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:360
+#: calendar/gui/e-calendar-table.c:417
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3441
-#: calendar/gui/e-week-view.c:3288 mail/folder-browser.c:1336
+#: calendar/gui/e-calendar-table.c:914 calendar/gui/e-day-view.c:3443
+#: calendar/gui/e-week-view.c:3296 mail/folder-browser.c:1371
 #: shell/e-shortcuts-view.c:385
 #, fuzzy
 msgid "_Open"
 msgstr "Apri"
 
-#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3450
-#: calendar/gui/e-week-view.c:3297 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:918 calendar/gui/e-day-view.c:3452
+#: calendar/gui/e-week-view.c:3305 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:856 calendar/gui/e-day-view.c:3452
-#: calendar/gui/e-week-view.c:3299 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:920 calendar/gui/e-day-view.c:3454
+#: calendar/gui/e-week-view.c:3307 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:14
 msgid "_Copy"
 msgstr "_Copia"
 
-#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3427
-#: calendar/gui/e-day-view.c:3454 calendar/gui/e-week-view.c:3275
-#: calendar/gui/e-week-view.c:3301 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:922 calendar/gui/e-day-view.c:3429
+#: calendar/gui/e-day-view.c:3456 calendar/gui/e-week-view.c:3283
+#: calendar/gui/e-week-view.c:3309 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:40 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:17
 msgid "_Paste"
 msgstr "_Incolla"
 
-#: calendar/gui/e-calendar-table.c:863
+#: calendar/gui/e-calendar-table.c:927
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "Segna come Completato"
 
-#: calendar/gui/e-calendar-table.c:865
+#: calendar/gui/e-calendar-table.c:929
 #, fuzzy
 msgid "_Delete this Task"
 msgstr "Elimina questo obiettivo"
 
-#: calendar/gui/e-calendar-table.c:868
+#: calendar/gui/e-calendar-table.c:932
 #, fuzzy
 msgid "_Mark Tasks as Complete"
 msgstr "Segna come Completato"
 
-#: calendar/gui/e-calendar-table.c:870
+#: calendar/gui/e-calendar-table.c:934
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Elimina questo obiettivo"
 
-#: calendar/gui/e-calendar-table.c:1130
+#: calendar/gui/e-calendar-table.c:1194
 #: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Click to add a task"
@@ -4586,8 +4609,8 @@ msgstr "Fare clic qui per aggiungere un obiettivo"
 msgid "Alarms"
 msgstr "Avvisi Sonoro"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:702
-#: camel/camel-filter-driver.c:819
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:718
+#: camel/camel-filter-driver.c:834
 #, fuzzy
 msgid "Complete"
 msgstr "Completato"
@@ -4619,8 +4642,8 @@ 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:30 shell/e-shortcuts.c:1050
-#: shell/e-storage-set-view.c:1424 shell/e-summary-storage.c:80
+#: my-evolution/component-factory.c:45 shell/e-shortcuts.c:1050
+#: shell/e-storage-set-view.c:1420 shell/e-summary-storage.c:80
 msgid "Summary"
 msgstr "Indice"
 
@@ -4641,7 +4664,7 @@ 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:285 calendar/gui/e-day-view.c:1374
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1458
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -4653,304 +4676,321 @@ 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:608 calendar/gui/e-week-view.c:344
-#: calendar/gui/print.c:765
+#: calendar/gui/e-day-view.c:608 calendar/gui/e-week-view.c:345
+#: calendar/gui/print.c:769
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:347
-#: calendar/gui/print.c:767
+#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:348
+#: calendar/gui/print.c:771
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3422 calendar/gui/e-week-view.c:3270
+#: calendar/gui/e-day-view.c:3424 calendar/gui/e-week-view.c:3278
 #, fuzzy
 msgid "New All Day _Event"
 msgstr "Nuovo Evento dell'intera giornata"
 
-#: calendar/gui/e-day-view.c:3432 calendar/gui/e-week-view.c:3280
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3288
 #: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "Vai a _Oggi"
 
-#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3282
+#: calendar/gui/e-day-view.c:3436 calendar/gui/e-week-view.c:3290
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "Vai alla data..."
 
-#: calendar/gui/e-day-view.c:3443 calendar/gui/e-week-view.c:3290
+#: calendar/gui/e-day-view.c:3445 calendar/gui/e-week-view.c:3298
 #, fuzzy
 msgid "_Delete this Appointment"
 msgstr "Elimina questo Appuntamento"
 
-#: calendar/gui/e-day-view.c:3462 calendar/gui/e-week-view.c:3315
+#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3323
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "Rendi rimandabile questa Ricorrenza"
 
-#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3317
+#: calendar/gui/e-day-view.c:3466 calendar/gui/e-week-view.c:3325
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "Elimina questa Ricorrenza"
 
-#: calendar/gui/e-day-view.c:3466 calendar/gui/e-week-view.c:3319
+#: calendar/gui/e-day-view.c:3468 calendar/gui/e-week-view.c:3327
 #, fuzzy
 msgid "Delete _All Occurrences"
 msgstr "Elimina Tutte le Ricorrenze"
 
+#: calendar/gui/e-itip-control.c:469
+msgid "Meeting begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:474
+msgid "Task begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:479
+#, fuzzy
+msgid "Free/Busy info begins: <b>"
+msgstr "Informazioni Utente"
+
+#: calendar/gui/e-itip-control.c:483
+msgid "Begins: <b>"
+msgstr ""
+
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:677
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:664
+#: calendar/gui/e-itip-control.c:692
 #, c-format
 msgid "<b>Summary:</b> %s<br><br>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:664
+#: calendar/gui/e-itip-control.c:692
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:674
+#: calendar/gui/e-itip-control.c:702
 #, fuzzy, c-format
 msgid "<b>Description:</b> %s"
 msgstr "Descrizione:"
 
-#: calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:737
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:738
 #, fuzzy
 msgid "Meeting Information"
 msgstr "Nessuna informazione"
 
-#: calendar/gui/e-itip-control.c:715
+#: calendar/gui/e-itip-control.c:742
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:716
+#: calendar/gui/e-itip-control.c:743
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "Annulla Riunione"
 
-#: calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-itip-control.c:747
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:721
+#: calendar/gui/e-itip-control.c:748
 #, fuzzy
 msgid "Meeting Update"
 msgstr "T_ermine dell' appuntamento ore:"
 
-#: calendar/gui/e-itip-control.c:725
+#: calendar/gui/e-itip-control.c:752
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:726
+#: calendar/gui/e-itip-control.c:753
 #, fuzzy
 msgid "Meeting Update Request"
 msgstr "Richiesta _appuntamento"
 
-#: calendar/gui/e-itip-control.c:730
+#: calendar/gui/e-itip-control.c:757
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "Indirizzo a cui _spedire"
 
-#: calendar/gui/e-itip-control.c:731
+#: calendar/gui/e-itip-control.c:758
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "Annulla Riunione"
 
-#: calendar/gui/e-itip-control.c:735
+#: calendar/gui/e-itip-control.c:762
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:736
+#: calendar/gui/e-itip-control.c:763
 #, fuzzy
 msgid "Meeting Cancellation"
 msgstr "Scegliere un file"
 
-#: calendar/gui/e-itip-control.c:740 calendar/gui/e-itip-control.c:788
-#: calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:767 calendar/gui/e-itip-control.c:815
+#: calendar/gui/e-itip-control.c:848
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:741
+#: calendar/gui/e-itip-control.c:768
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "Stampa Messaggio"
 
-#: calendar/gui/e-itip-control.c:758
+#: calendar/gui/e-itip-control.c:785
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:759
+#: calendar/gui/e-itip-control.c:786
 #, fuzzy
 msgid "Task Information"
 msgstr "Informazione"
 
-#: calendar/gui/e-itip-control.c:763
+#: calendar/gui/e-itip-control.c:790
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:791
 #, fuzzy
 msgid "Task Proposal"
 msgstr "TaskPad"
 
-#: calendar/gui/e-itip-control.c:768
+#: calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:769
+#: calendar/gui/e-itip-control.c:796
 #, fuzzy
 msgid "Task Update"
 msgstr "era dopo"
 
-#: calendar/gui/e-itip-control.c:773
+#: calendar/gui/e-itip-control.c:800
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:774
+#: calendar/gui/e-itip-control.c:801
 #, fuzzy
 msgid "Task Update Request"
 msgstr "Richiesta _obiettivo"
 
-#: calendar/gui/e-itip-control.c:778
+#: calendar/gui/e-itip-control.c:805
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "Indirizzo a cui _spedire"
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:806
 #, fuzzy
 msgid "Task Reply"
 msgstr "Rispondi"
 
-#: calendar/gui/e-itip-control.c:783
+#: calendar/gui/e-itip-control.c:810
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:784
+#: calendar/gui/e-itip-control.c:811
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "Annulla Riunione"
 
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:816
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "Messaggio del Calendario"
 
-#: calendar/gui/e-itip-control.c:806
+#: calendar/gui/e-itip-control.c:833
 #, fuzzy, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "Informazioni Utente"
 
-#: calendar/gui/e-itip-control.c:807
+#: calendar/gui/e-itip-control.c:834
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "Informazioni Utente"
 
-#: calendar/gui/e-itip-control.c:811
+#: calendar/gui/e-itip-control.c:838
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:812
+#: calendar/gui/e-itip-control.c:839
 #, fuzzy
 msgid "Free/Busy Request"
 msgstr "Free-busy URL"
 
-#: calendar/gui/e-itip-control.c:816
+#: calendar/gui/e-itip-control.c:843
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "Indirizzo a cui _spedire"
 
-#: calendar/gui/e-itip-control.c:817
+#: calendar/gui/e-itip-control.c:844
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "Free-busy URL"
 
-#: calendar/gui/e-itip-control.c:822
+#: calendar/gui/e-itip-control.c:849
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "Stampa Messaggio"
 
-#: calendar/gui/e-itip-control.c:889
+#: calendar/gui/e-itip-control.c:916
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "La cartella appare irrimediabilmente corrotta."
 
-#: calendar/gui/e-itip-control.c:908
+#: calendar/gui/e-itip-control.c:935
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:936 calendar/gui/e-itip-control.c:942
+#: calendar/gui/e-itip-control.c:963 calendar/gui/e-itip-control.c:969
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1088
 #, fuzzy
 msgid "Calendar file could not be updated!\n"
 msgstr "Il cursore non pu� essere caricato\n"
 
-#: calendar/gui/e-itip-control.c:1063
+#: calendar/gui/e-itip-control.c:1090
 #, fuzzy
 msgid "Update complete\n"
 msgstr "Completato in data:"
 
-#: calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.c:1134
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1142
 msgid "Attendee status ould not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1144
 #, fuzzy
 msgid "Attendee status updated\n"
 msgstr "Indirizzo del partecipante"
 
-#: calendar/gui/e-itip-control.c:1119
+#: calendar/gui/e-itip-control.c:1146
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1174
 #, fuzzy
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "Impossibile aprire il file del calendario!\n"
 
-#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-itip-control.c:1176
 #, fuzzy
 msgid "Removal Complete"
 msgstr "% Comp_leta:"
 
-#: calendar/gui/e-itip-control.c:1181 calendar/gui/e-itip-control.c:1216
+#: calendar/gui/e-itip-control.c:1208 calendar/gui/e-itip-control.c:1242
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "Data di spedizione"
 
-#: calendar/gui/e-itip-control.c:1183 calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1210 calendar/gui/e-itip-control.c:1246
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1380
+#: calendar/gui/e-itip-control.c:1406
 msgid "Unable to find any of your identities in the attendees list!\n"
 msgstr ""
 
@@ -5014,6 +5054,14 @@ msgstr "Alimentazione della carta:"
 msgid "Room"
 msgstr ""
 
+#: calendar/gui/e-meeting-model.c:226 calendar/gui/e-meeting-model.c:261
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:674
+#: calendar/gui/e-meeting-model.c:690
+#: camel/providers/smtp/camel-smtp-transport.c:224
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
+msgid "Unknown"
+msgstr "Sconosciuto"
+
 #: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
 #: calendar/gui/e-meeting-model.c:686
 msgid "Chair"
@@ -5071,14 +5119,14 @@ msgstr "In corso"
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:472
-#: calendar/gui/e-meeting-time-sel.c:1936
+#: calendar/gui/e-meeting-time-sel.c:1937
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:476
-#: calendar/gui/e-meeting-time-sel.c:1964 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:1965 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:345
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
@@ -5086,7 +5134,7 @@ msgstr "%a %m/%d/%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:480 e-util/e-time-utils.c:221
-#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1552
+#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1577
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
@@ -5164,17 +5212,17 @@ msgstr "Impossibile caricare l'obiettivo in `%s'"
 msgid "The method required to load `%s' is not supported"
 msgstr "Il metodo richiesto per caricare `%s' non � supportato"
 
-#: calendar/gui/e-week-view.c:3268 calendar/gui/e-week-view.c:3306
+#: calendar/gui/e-week-view.c:3276 calendar/gui/e-week-view.c:3314
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "Nuovo Appuntamento..."
 
-#: calendar/gui/gnome-cal.c:1318
+#: calendar/gui/gnome-cal.c:1319
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Impossibile aprire la cartella in `%s'"
 
-#: calendar/gui/gnome-cal.c:1329
+#: calendar/gui/gnome-cal.c:1330
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Il metodo richiesto per aprire `%s' non � supportato"
@@ -5246,205 +5294,205 @@ msgid "Could not create the component editor factory"
 msgstr ""
 "Impossibile creare la babbrica per il servizio di notifica dell'avviso sonoro"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "1st"
 msgstr "1"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "2nd"
 msgstr "2"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "3rd"
 msgstr "3"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "4th"
 msgstr "4"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "5th"
 msgstr "5"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "6th"
 msgstr "6"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "7th"
 msgstr "7"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "8th"
 msgstr "8"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "9th"
 msgstr "9"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "10th"
 msgstr "10"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "11th"
 msgstr "11"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "12th"
 msgstr "12"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "13th"
 msgstr "13"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "14th"
 msgstr "14"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "15th"
 msgstr "15"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "16th"
 msgstr "16"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "17th"
 msgstr "17"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "18th"
 msgstr "18"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "19th"
 msgstr "19"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "20th"
 msgstr "20"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "21st"
 msgstr "21"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "22nd"
 msgstr "22"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "23rd"
 msgstr "23"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "24th"
 msgstr "24"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "25th"
 msgstr "25"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "26th"
 msgstr "26"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "27th"
 msgstr "27"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "28th"
 msgstr "28"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "29th"
 msgstr "29"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "30th"
 msgstr "30"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:432
 msgid "31st"
 msgstr "31"
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "Su"
 msgstr "Do"
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "Mo"
 msgstr "Lu"
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "Tu"
 msgstr "Ma"
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "We"
 msgstr "Me"
 
-#: calendar/gui/print.c:497
+#: calendar/gui/print.c:500
 msgid "Th"
 msgstr "Gi"
 
-#: calendar/gui/print.c:497
+#: calendar/gui/print.c:500
 msgid "Fr"
 msgstr "Ve"
 
-#: calendar/gui/print.c:497
+#: calendar/gui/print.c:500
 msgid "Sa"
 msgstr "Sa"
 
 #. Day
-#: calendar/gui/print.c:1827
+#: calendar/gui/print.c:1831
 #, fuzzy
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Data odierna (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1846 calendar/gui/print.c:1850
+#: calendar/gui/print.c:1850 calendar/gui/print.c:1854
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1847
+#: calendar/gui/print.c:1851
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1858
+#: calendar/gui/print.c:1862
 #, fuzzy, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Settimana corrente (%s  - %s) "
 
 #. Month
-#: calendar/gui/print.c:1866
+#: calendar/gui/print.c:1870
 #, fuzzy
 msgid "Selected month (%b %Y)"
 msgstr "Mese corrente (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1873
+#: calendar/gui/print.c:1877
 #, fuzzy
 msgid "Selected year (%Y)"
 msgstr "Anno corrente (%Y)"
 
-#: calendar/gui/print.c:2214
+#: calendar/gui/print.c:2221
 msgid "Print Calendar"
 msgstr "Stampa Calendario"
 
-#: calendar/gui/print.c:2302 calendar/gui/print.c:2394
-#: mail/mail-callbacks.c:2071 my-evolution/e-summary.c:551
+#: calendar/gui/print.c:2312 calendar/gui/print.c:2404
+#: mail/mail-callbacks.c:2080 my-evolution/e-summary.c:607
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
 msgstr "Anteprima di stampa"
 
-#: calendar/gui/print.c:2331
+#: calendar/gui/print.c:2341
 #, fuzzy
 msgid "Print Item"
 msgstr "Stampa questo articolo"
 
-#: calendar/gui/print.c:2412
+#: calendar/gui/print.c:2422
 msgid "Print Setup"
 msgstr "Impostazione pagina"
 
@@ -5645,72 +5693,89 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr ""
 
-#: camel/camel-disco-store.c:305
+#: camel/camel-disco-store.c:336
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
+#: camel/camel-filter-driver.c:549 camel/camel-filter-driver.c:558
 #, fuzzy
 msgid "Syncing folders"
 msgstr "Sincronizzazione cartella"
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:659
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "Impossibile aprire la rubruca"
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:668
 #, fuzzy
 msgid "Unable to process spool folder"
 msgstr "Impossibile aprire la rubruca"
 
-#: camel/camel-filter-driver.c:667
+#: camel/camel-filter-driver.c:683
 #, fuzzy, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Scaricamento del messaggio %s"
 
-#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
+#: camel/camel-filter-driver.c:687 camel/camel-filter-driver.c:700
 #, fuzzy, c-format
 msgid "Failed on message %d"
 msgstr "_Invia messaggio"
 
-#: camel/camel-filter-driver.c:672
+#: camel/camel-filter-driver.c:688
 #, fuzzy
 msgid "Cannot open message"
 msgstr ""
 "Impossibile prendere il messaggio: %s\n"
 "%s"
 
-#: camel/camel-filter-driver.c:698 camel/camel-filter-driver.c:814
+#: camel/camel-filter-driver.c:714 camel/camel-filter-driver.c:829
 #, fuzzy
 msgid "Syncing folder"
 msgstr "Sincronizzazione cartella"
 
-#: camel/camel-filter-driver.c:770
+#: camel/camel-filter-driver.c:786
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "Salvare messaggio %d di %d (uid \"%s\")"
 
-#: camel/camel-filter-driver.c:775 camel/camel-filter-driver.c:793
+#: camel/camel-filter-driver.c:791 camel/camel-filter-driver.c:809
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "Salvare messaggio %d di %d (uid \"%s\")"
 
-#: camel/camel-filter-driver.c:900
+#: camel/camel-filter-driver.c:918
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Errore nel filtro di smistamento: %s: %s"
 
-#: camel/camel-filter-driver.c:906
+#: camel/camel-filter-driver.c:924
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Errore nell'esecuzione del filtro: %s: %s"
 
-#: camel/camel-filter-search.c:479 camel/camel-filter-search.c:486
+#: camel/camel-filter-search.c:494 camel/camel-filter-search.c:501
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Errore nell'esecuzione della ricerca con filtro: %s: %s"
 
+#: camel/camel-folder.c:472
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1039
+#, fuzzy, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr ""
+"Errore nell'esecuzione della ricerca: %s:\n"
+"%s"
+
+#: camel/camel-folder.c:1219
+#, fuzzy
+msgid "Moving messages"
+msgstr "Copia messaggi"
+
 #: camel/camel-folder-search.c:333
 #, c-format
 msgid ""
@@ -5738,7 +5803,7 @@ msgstr "(match-all) richiede un singolo risultato booleano"
 msgid "Performing query on unknown header: %s"
 msgstr "� stata effettuata una ricerca su un header sconosciuto: %s"
 
-#: camel/camel-folder-search.c:747 camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:748 camel/camel-folder-search.c:792
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Tipo non valido in body-contains, ci si aspettava una stringa"
 
@@ -5839,83 +5904,83 @@ msgstr "Errore nella scrittura del file temp di posta: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Errore nella scrittura del file temp di posta: %s"
 
-#: camel/camel-pgp-context.c:193
+#: camel/camel-pgp-context.c:191
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Digitare la %s passphrase per %s"
 
-#: camel/camel-pgp-context.c:196
+#: camel/camel-pgp-context.c:194
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "Digitare la %s passphrase"
 
-#: camel/camel-pgp-context.c:518
+#: camel/camel-pgp-context.c:525
 #, fuzzy
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr "Impossibile inviare il messaggio: senza destinatari."
 
-#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:532 camel/camel-pgp-context.c:706
 #, fuzzy
 msgid "Cannot sign this message: no password provided"
 msgstr ""
 "Impossibile inviare il messaggio: l'indirizzo del mittente non � valido."
 
-#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:538 camel/camel-pgp-context.c:712
 #, fuzzy, c-format
 msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "Impossibile ridirigere verso GPG/PGP: %s  "
 
-#: camel/camel-pgp-context.c:693
+#: camel/camel-pgp-context.c:699
 #, fuzzy
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr "Impossibile inviare il messaggio: senza destinatari."
 
-#: camel/camel-pgp-context.c:886
+#: camel/camel-pgp-context.c:891
 #, fuzzy
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr "Impossibile inviare il messaggio: senza destinatari."
 
-#: camel/camel-pgp-context.c:892
+#: camel/camel-pgp-context.c:897
 #, fuzzy, c-format
 msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "Impossibile ridirigere verso GPG/PGP: %s  "
 
-#: camel/camel-pgp-context.c:903
+#: camel/camel-pgp-context.c:908
 #, fuzzy, c-format
 msgid "Cannot verify this message: couldn't create temp file: %s"
 msgstr "Impossibile creare file temporaneo: %s  "
 
-#: camel/camel-pgp-context.c:1069
+#: camel/camel-pgp-context.c:1076
 #, fuzzy
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr "Impossibile inviare il messaggio: senza destinatari."
 
-#: camel/camel-pgp-context.c:1079
+#: camel/camel-pgp-context.c:1086
 #, fuzzy
 msgid "Cannot encrypt this message: no password provided"
 msgstr ""
 "Impossibile inviare il messaggio: l'indirizzo del mittente non � valido."
 
-#: camel/camel-pgp-context.c:1086
+#: camel/camel-pgp-context.c:1093
 #, fuzzy, c-format
 msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "Impossibile ridirigere verso GPG/PGP: %s  "
 
-#: camel/camel-pgp-context.c:1095
+#: camel/camel-pgp-context.c:1102
 #, fuzzy
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr "Impossibile inviare il messaggio: senza destinatari."
 
-#: camel/camel-pgp-context.c:1258
+#: camel/camel-pgp-context.c:1264
 #, fuzzy
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr "Impossibile inviare il messaggio: senza destinatari."
 
-#: camel/camel-pgp-context.c:1266
+#: camel/camel-pgp-context.c:1272
 msgid "Cannot decrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1273
+#: camel/camel-pgp-context.c:1279
 #, fuzzy, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "Impossibile ridirigere verso GPG/PGP: %s  "
@@ -5959,13 +6024,13 @@ msgstr "Impossibile connettersi a %s (porta %d): %s"
 msgid "(unknown host)"
 msgstr "(host sconosciuto)"
 
-#: camel/camel-remote-store.c:361 camel/camel-remote-store.c:423
-#: camel/camel-remote-store.c:486
+#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
+#: camel/camel-remote-store.c:483
 #: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "Operazione annullata"
 
-#: camel/camel-remote-store.c:489
+#: camel/camel-remote-store.c:486
 #, fuzzy, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Il server si � disconnesso inaspettatamente"
@@ -6076,7 +6141,7 @@ msgstr ""
 " %s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:492
+#: camel/providers/imap/camel-imap-store.c:494
 msgid "Bad authentication response from server."
 msgstr "Cattiva risposta di autenticazione dal server."
 
@@ -6098,7 +6163,7 @@ msgstr "Autenticazione fallita"
 
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:302
-#: camel/providers/pop3/camel-pop3-provider.c:68 mail/mail-config.glade.h:54
+#: camel/providers/pop3/camel-pop3-provider.c:68 mail/mail-config.glade.h:55
 msgid "Password"
 msgstr "Password"
 
@@ -6128,37 +6193,37 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Compilazione dell'espressione regolare fallita: %s: %s"
 
-#: camel/camel-service.c:154
+#: camel/camel-service.c:157
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' necessita di un componente per lo username "
 
-#: camel/camel-service.c:162
+#: camel/camel-service.c:165
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' necessita di un componente per l'host"
 
-#: camel/camel-service.c:170
+#: camel/camel-service.c:173
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' necessita di un componente per il percorso"
 
-#: camel/camel-service.c:548
+#: camel/camel-service.c:602
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:575
+#: camel/camel-service.c:629
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:600
+#: camel/camel-service.c:654
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:602
+#: camel/camel-service.c:656
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
@@ -6171,12 +6236,12 @@ msgstr "Fornitore di cartelle email virtuali "
 msgid "For reading mail as a query of another set of folders"
 msgstr "Per leggere la posta come una ricerca di un altro insieme di cartelle"
 
-#: camel/camel-session.c:322 camel/camel-session.c:391
+#: camel/camel-session.c:324 camel/camel-session.c:393
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Nessun fornitore disponibile per il protocollo `%s'"
 
-#: camel/camel-session.c:508
+#: camel/camel-session.c:510
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -6228,7 +6293,7 @@ msgstr ""
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Impossibile avere la cartella %s: %s"
 
-#: camel/camel-tcp-stream-openssl.c:463
+#: camel/camel-tcp-stream-openssl.c:491
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -6236,7 +6301,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:369
+#: camel/camel-tcp-stream-openssl.c:496 camel/camel-tcp-stream-ssl.c:369
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -6265,17 +6330,37 @@ msgstr ""
 "Impossibile il file %s:\n"
 "%s "
 
-#: camel/camel-vee-folder.c:546
+#: camel/camel-vee-folder.c:554
 #, fuzzy, c-format
 msgid "No such message %s in %s"
 msgstr "Non � presente il messaggio: %s"
 
-#: camel/camel-vee-folder.c:641
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message: %s"
 msgstr "Non � presente il messaggio: %s"
 
-#: camel/camel-vtrash-folder.c:106
+#: camel/camel-vee-store.c:250
+#, fuzzy, c-format
+msgid "Cannot delete folder: %s: Invalid operation"
+msgstr "Impossibile avere la cartella %s: %s"
+
+#: camel/camel-vee-store.c:286
+#, fuzzy, c-format
+msgid "Cannot delete folder: %s: No such folder"
+msgstr "Impossibile avere la cartella %s: %s"
+
+#: camel/camel-vee-store.c:298
+#, fuzzy, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "Impossibile avere la cartella %s: %s"
+
+#: camel/camel-vee-store.c:326
+#, fuzzy, c-format
+msgid "Cannot rename folder: %s: No such folder"
+msgstr "Impossibile avere la cartella %s: %s"
+
+#: camel/camel-vtrash-folder.c:109
 #, fuzzy
 msgid "You cannot copy messages from this trash folder."
 msgstr ""
@@ -6327,7 +6412,7 @@ msgid "Scanning for changed messages"
 msgstr "Salvataggio messaggi"
 
 #: camel/providers/imap/camel-imap-folder.c:1491
-#: camel/providers/imap/camel-imap-folder.c:1890
+#: camel/providers/imap/camel-imap-folder.c:1899
 #, fuzzy
 msgid "This message is not currently available"
 msgstr ""
@@ -6344,7 +6429,7 @@ msgstr ""
 msgid "Scanning for new messages"
 msgstr "Salvataggio messaggi"
 
-#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/imap/camel-imap-folder.c:1936
 msgid "Could not find message body in FETCH response."
 msgstr "Impossibile trovare il corpo del messaggio nella risposta di FETCH."
 
@@ -6361,7 +6446,7 @@ msgstr "Impossibile creare la directory %s: %s"
 msgid "Failed to cache message %s: %s"
 msgstr "_Invia messaggio"
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:14
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Checking for new mail"
 msgstr "Crea una nuova email"
@@ -6371,7 +6456,7 @@ msgstr "Crea una nuova email"
 msgid "Check for new messages in all folders"
 msgstr "Copia messaggio in una nuova cartella"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:733
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:767
 msgid "Folders"
 msgstr "Cartelle"
 
@@ -6408,28 +6493,28 @@ msgstr ""
 "Con questa opzione ci si connette al server IMAP usando una password di "
 "testo semplice."
 
-#: camel/providers/imap/camel-imap-store.c:515
+#: camel/providers/imap/camel-imap-store.c:517
 #, 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:525
+#: camel/providers/imap/camel-imap-store.c:527
 #: camel/providers/smtp/camel-smtp-transport.c:388
 #, 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:549
+#: camel/providers/imap/camel-imap-store.c:551
 #, 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:564
+#: camel/providers/imap/camel-imap-store.c:566
 #: camel/providers/smtp/camel-smtp-transport.c:432
 msgid "You didn't enter a password."
 msgstr "Non � stata inserita la password."
 
-#: camel/providers/imap/camel-imap-store.c:590
+#: camel/providers/imap/camel-imap-store.c:592
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6440,12 +6525,12 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:889
+#: camel/providers/imap/camel-imap-store.c:891
 #, c-format
 msgid "No such folder %s"
 msgstr "Non � presente la cartella %s"
 
-#: camel/providers/imap/camel-imap-store.c:1090
+#: camel/providers/imap/camel-imap-store.c:1131
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -6482,53 +6567,53 @@ msgstr "File di posta UNIX qmail maildir-format"
 msgid "For storing local mail in qmail maildir directories."
 msgstr "Per archiviare la posta locale nelle directory qmail maildir"
 
-#: camel/providers/local/camel-local-provider.c:77
+#: camel/providers/local/camel-local-provider.c:78
 #, fuzzy
 msgid "Standard Unix mbox spools"
 msgstr "File di mailbox standard per Unix"
 
-#: camel/providers/local/camel-local-provider.c:78
+#: camel/providers/local/camel-local-provider.c:79
 #, fuzzy
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr "Per archiviare la posta locale nelle directory qmail maildir"
 
-#: camel/providers/local/camel-local-store.c:127
-#: camel/providers/local/camel-spool-store.c:112
+#: camel/providers/local/camel-local-store.c:132
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:134
+#: camel/providers/local/camel-local-store.c:139
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:142
-#: camel/providers/local/camel-local-store.c:158
+#: camel/providers/local/camel-local-store.c:147
+#: camel/providers/local/camel-local-store.c:163
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Impossibile avere la cartella %s: %s"
 
-#: camel/providers/local/camel-local-store.c:173
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:183
+#: camel/providers/local/camel-local-store.c:190
 #, c-format
 msgid "Local mail file %s"
 msgstr "File di posta locale: %s"
 
-#: camel/providers/local/camel-local-store.c:240
+#: camel/providers/local/camel-local-store.c:247
 #, 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:282
+#: camel/providers/local/camel-local-store.c:289
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Impossibile cancellare l'indice della cartella `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:292
+#: camel/providers/local/camel-local-store.c:299
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Impossibile cancellare il file indice della cartella `%s': %s"
@@ -6820,26 +6905,26 @@ msgstr "Impossibile aprire la casella di posta: %s: %s\n"
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "Inpossibile accodare il messaggio al file mbox: %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:133
+#: camel/providers/local/camel-spool-store.c:116
 #, fuzzy, c-format
 msgid "Spool `%s' does not exist or is not a regular file"
 msgstr "`%s' non � un file regolare."
 
-#: camel/providers/local/camel-spool-store.c:159
+#: camel/providers/local/camel-spool-store.c:142
 #, fuzzy, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "La cartella `%s' non esiste."
 
-#: camel/providers/local/camel-spool-store.c:181
+#: camel/providers/local/camel-spool-store.c:164
 #, fuzzy, c-format
 msgid "Spool mail file %s"
 msgstr "File di posta locale: %s"
 
-#: camel/providers/local/camel-spool-store.c:227
+#: camel/providers/local/camel-spool-store.c:210
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:235
+#: camel/providers/local/camel-spool-store.c:218
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
@@ -6966,31 +7051,31 @@ msgstr "Ricezione indice POP"
 msgid "Could not check POP server for new messages: %s"
 msgstr "Impossibile connettersi al server POP su %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:235
+#: camel/providers/pop3/camel-pop3-folder.c:242
 msgid "Could not open folder: message listing was incomplete."
 msgstr "Impossibile aprire la cartella: la lista dei messaggi era incompleta."
 
-#: camel/providers/pop3/camel-pop3-folder.c:259
+#: camel/providers/pop3/camel-pop3-folder.c:266
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "Stampa il messaggio selezionato"
 
-#: camel/providers/pop3/camel-pop3-folder.c:335
+#: camel/providers/pop3/camel-pop3-folder.c:342
 #, fuzzy, c-format
 msgid "Could not fetch message: %s"
 msgstr "Impossibile inviare il messaggio: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:351
+#: camel/providers/pop3/camel-pop3-folder.c:358
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Impossibile scaricare messaggi dal server POP %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:374
+#: camel/providers/pop3/camel-pop3-folder.c:381
 #, c-format
 msgid "No message with uid %s"
 msgstr "Nessun messaggio con uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:378
+#: camel/providers/pop3/camel-pop3-folder.c:385
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Ricezione messaggio POP %d"
@@ -7010,7 +7095,7 @@ msgstr "Non cancellare i messaggi dal server"
 msgid "Delete after %s day(s)"
 msgstr "Elimina questo obiettivo"
 
-#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:53
+#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:54
 msgid "POP"
 msgstr "POP"
 
@@ -7106,7 +7191,7 @@ msgid "Unexpected response from POP server: %s"
 msgstr "Risposta inaspettata dal server IMAP: %s"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:73
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -7161,7 +7246,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Posta consegnata attraverso il programma sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:66
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -7809,13 +7894,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:309 e-util/e-time-utils.c:396
-#: widgets/misc/e-dateedit.c:1360 widgets/misc/e-dateedit.c:1587
+#: widgets/misc/e-dateedit.c:1385 widgets/misc/e-dateedit.c:1612
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:313 e-util/e-time-utils.c:388
-#: widgets/misc/e-dateedit.c:1357 widgets/misc/e-dateedit.c:1584
+#: widgets/misc/e-dateedit.c:1382 widgets/misc/e-dateedit.c:1609
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -7966,8 +8051,8 @@ msgstr ""
 "Oops, ti sei dimenticato di scegliere una cartella.\n"
 "Tornare indietro e specificare una cartella valida per consegnarvi la posta."
 
-#: filter/filter-folder.c:232 filter/vfolder-rule.c:351
-#: mail/mail-account-gui.c:820
+#: filter/filter-folder.c:232 filter/vfolder-rule.c:356
+#: mail/mail-account-gui.c:822
 msgid "Select Folder"
 msgstr "Scegli Cartella"
 
@@ -8220,7 +8305,7 @@ msgstr "Risposto a"
 msgid "Score"
 msgstr "Punteggio"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1242
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1251
 msgid "Sender"
 msgstr "Mittente"
 
@@ -8254,7 +8339,7 @@ msgstr "comincia per"
 msgid "Stop Processing"
 msgstr "Arresta processo in corso"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:893
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:917
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Oggetto"
@@ -8286,7 +8371,7 @@ msgstr "Modifica Interamente"
 msgid "Score Rules"
 msgstr "Regole di punteggio"
 
-#: filter/vfolder-rule.c:203
+#: filter/vfolder-rule.c:206
 msgid "Oops.  You need to to specify at least one folder as a source."
 msgstr ""
 
@@ -8307,7 +8392,7 @@ msgstr "Importazione"
 msgid "Please wait"
 msgstr "finisce per"
 
-#: importers/elm-importer.c:171 importers/netscape-importer.c:701
+#: importers/elm-importer.c:171 importers/netscape-importer.c:708
 #: importers/pine-importer.c:369
 #, fuzzy, c-format
 msgid "Importing %s as %s"
@@ -8315,13 +8400,13 @@ msgstr ""
 "Importazione di %s.\n"
 "Avvio di %s"
 
-#: importers/elm-importer.c:377 importers/netscape-importer.c:794
+#: importers/elm-importer.c:377 importers/netscape-importer.c:801
 #: importers/pine-importer.c:506
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "Invio di \"%s\" in corso"
 
-#: importers/elm-importer.c:528 importers/netscape-importer.c:967
+#: importers/elm-importer.c:528 importers/netscape-importer.c:974
 #: importers/pine-importer.c:669 mail/component-factory.c:96
 #, fuzzy
 msgid "Mail"
@@ -8357,22 +8442,22 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: importers/netscape-importer.c:897 importers/pine-importer.c:602
+#: importers/netscape-importer.c:904 importers/pine-importer.c:602
 #, fuzzy
 msgid "Scanning directory"
 msgstr "Scansione delle cartelle IMAP in corso"
 
-#: importers/netscape-importer.c:906
+#: importers/netscape-importer.c:913
 #, fuzzy
 msgid "Starting import"
 msgstr "Data di _inizio:"
 
-#: importers/netscape-importer.c:972
+#: importers/netscape-importer.c:979
 #, fuzzy
 msgid "Settings"
 msgstr "Impostazioni..."
 
-#: importers/netscape-importer.c:993
+#: importers/netscape-importer.c:1000
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8459,21 +8544,27 @@ msgstr "_Propriet�"
 msgid "Change this folder's properties"
 msgstr "Modifica le propriet� del file"
 
-#: mail/component-factory.c:790
+#: mail/component-factory.c:698
+msgid ""
+"Some of your mail settings seem corrupt, please check that everything is in "
+"order."
+msgstr ""
+
+#: mail/component-factory.c:812
 #, fuzzy
 msgid "New Mail Message"
 msgstr "Invia _Messaggio"
 
-#: mail/component-factory.c:790
+#: mail/component-factory.c:812
 #, fuzzy
 msgid "New _Mail Message"
 msgstr "Invia _Messaggio"
 
-#: mail/component-factory.c:821
+#: mail/component-factory.c:843
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Impossibile inizializzare il componente della posta di Evolution."
 
-#: mail/component-factory.c:1007
+#: mail/component-factory.c:1032
 msgid "Cannot register storage with shell"
 msgstr ""
 
@@ -8486,172 +8577,172 @@ msgstr "Propriet� per \"%s\""
 msgid "Properties"
 msgstr "Propriet�"
 
-#: mail/folder-browser.c:239 mail/mail-display.c:275
+#: mail/folder-browser.c:262 mail/mail-display.c:275
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Impossibile creare una directory temporanea: %s"
 
-#: mail/folder-browser.c:708
+#: mail/folder-browser.c:734
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/folder-browser.c:711 mail/folder-browser.c:716
-#: mail/folder-browser.c:720
+#: mail/folder-browser.c:737 mail/folder-browser.c:742
+#: mail/folder-browser.c:746
 msgid ", "
 msgstr ""
 
-#: mail/folder-browser.c:712
+#: mail/folder-browser.c:738
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/folder-browser.c:717
+#: mail/folder-browser.c:743
 #, fuzzy, c-format
 msgid "%d selected"
 msgstr "Eliminato"
 
-#: mail/folder-browser.c:722
+#: mail/folder-browser.c:748
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr " %d secondi"
 
-#: mail/folder-browser.c:724
+#: mail/folder-browser.c:750
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/folder-browser.c:958
+#: mail/folder-browser.c:993
 #, fuzzy
 msgid "Create vFolder from Search"
 msgstr "_Crea Filtro dal Messaggio"
 
-#: mail/folder-browser.c:1303
+#: mail/folder-browser.c:1338
 msgid "VFolder on _Subject"
 msgstr "Cartella Virtuale per _Oggetto"
 
-#: mail/folder-browser.c:1306
+#: mail/folder-browser.c:1341
 msgid "VFolder on Se_nder"
 msgstr "Cartella virtuale sul _Mittente"
 
-#: mail/folder-browser.c:1309
+#: mail/folder-browser.c:1344
 msgid "VFolder on _Recipients"
 msgstr "Cartella virtuale sui _Destinatari"
 
-#: mail/folder-browser.c:1312
+#: mail/folder-browser.c:1347
 #, fuzzy
 msgid "VFolder on Mailing _List"
 msgstr "Cartella virtuale sulla Mailng List"
 
-#: mail/folder-browser.c:1318
+#: mail/folder-browser.c:1353
 #, fuzzy
 msgid "Filter on Sub_ject"
 msgstr "Filtra sull'Oggetto"
 
-#: mail/folder-browser.c:1321
+#: mail/folder-browser.c:1356
 #, fuzzy
 msgid "Filter on Sen_der"
 msgstr "Filtro sul Mittente"
 
-#: mail/folder-browser.c:1324
+#: mail/folder-browser.c:1359
 #, fuzzy
 msgid "Filter on Re_cipients"
 msgstr "Filtro sui Destinatari:"
 
-#: mail/folder-browser.c:1327
+#: mail/folder-browser.c:1362
 #, fuzzy
 msgid "Filter on _Mailing List"
 msgstr "Filtra sulla Mailng List"
 
-#: mail/folder-browser.c:1338 ui/evolution-mail-message.xml.h:89
+#: mail/folder-browser.c:1373 ui/evolution-mail-message.xml.h:89
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "Salva Messaggio con nome..."
 
-#: mail/folder-browser.c:1340 ui/evolution-mail-message.xml.h:97
+#: mail/folder-browser.c:1375 ui/evolution-mail-message.xml.h:97
 msgid "_Save As..."
 msgstr "_Salva con nome..."
 
-#: mail/folder-browser.c:1342
+#: mail/folder-browser.c:1377
 msgid "_Print"
 msgstr "S_tampa"
 
-#: mail/folder-browser.c:1347 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1382 ui/evolution-mail-message.xml.h:96
 #, fuzzy
 msgid "_Reply to Sender"
 msgstr "Rispondi al Mittente"
 
-#: mail/folder-browser.c:1349 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1384 ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Reply to _List"
 msgstr "Rispondi a _Tutti"
 
-#: mail/folder-browser.c:1351 ui/evolution-mail-message.xml.h:68
+#: mail/folder-browser.c:1386 ui/evolution-mail-message.xml.h:68
 msgid "Reply to _All"
 msgstr "Rispondi a _Tutti"
 
-#: mail/folder-browser.c:1353
+#: mail/folder-browser.c:1388
 msgid "_Forward"
 msgstr "_Inoltra"
 
-#: mail/folder-browser.c:1356 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1391 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "Segna come _Letto"
 
-#: mail/folder-browser.c:1358 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1393 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Segna come _Non Letto"
 
-#: mail/folder-browser.c:1360
+#: mail/folder-browser.c:1395
 #, fuzzy
 msgid "Mark as _Important"
 msgstr "Importante"
 
-#: mail/folder-browser.c:1362
+#: mail/folder-browser.c:1397
 #, fuzzy
 msgid "Mark as Unim_portant"
 msgstr "Segna come Non Letto"
 
-#: mail/folder-browser.c:1367
+#: mail/folder-browser.c:1402
 msgid "_Move to Folder..."
 msgstr "_Sposta nella Cartella..."
 
-#: mail/folder-browser.c:1369
+#: mail/folder-browser.c:1404
 msgid "_Copy to Folder..."
 msgstr "_Copia nella cartella..."
 
-#: mail/folder-browser.c:1373 ui/evolution-mail-message.xml.h:99
+#: mail/folder-browser.c:1408 ui/evolution-mail-message.xml.h:99
 msgid "_Undelete"
 msgstr "_Ripristina"
 
-#: mail/folder-browser.c:1378
+#: mail/folder-browser.c:1413
 #, fuzzy
 msgid "Add Sender to Address Book"
 msgstr "Aggiungi rubrica"
 
-#: mail/folder-browser.c:1383
+#: mail/folder-browser.c:1418
 msgid "Apply Filters"
 msgstr "Applica Filtri"
 
-#: mail/folder-browser.c:1387
+#: mail/folder-browser.c:1422
 #, fuzzy
 msgid "Create Ru_le From Message"
 msgstr "Crea Regola dal Messaggio"
 
-#: mail/folder-browser.c:1538
+#: mail/folder-browser.c:1573
 msgid "Filter on Mailing List"
 msgstr "Filtra sulla Mailng List"
 
-#: mail/folder-browser.c:1539
+#: mail/folder-browser.c:1574
 msgid "VFolder on Mailing List"
 msgstr "Cartella virtuale sulla Mailng List"
 
-#: mail/folder-browser.c:1541
+#: mail/folder-browser.c:1576
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtra sulla Mailng List (%s)"
 
-#: mail/folder-browser.c:1542
+#: mail/folder-browser.c:1577
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Cartella Virtuale sulla Mailng List (%s)"
@@ -8730,19 +8821,19 @@ msgstr "Editor degli Account di Evolution"
 msgid "Evolution Account Editor"
 msgstr "Editor degli Account di Evolution"
 
-#: mail/mail-account-gui.c:945
+#: mail/mail-account-gui.c:947
 #, fuzzy
 msgid "Could not save signature file."
 msgstr ""
 "Impossibile aprire il file firma: %s\n"
 "%s "
 
-#: mail/mail-account-gui.c:1022
+#: mail/mail-account-gui.c:1024
 #, fuzzy
 msgid "Save signature"
 msgstr "File con la firma:"
 
-#: mail/mail-account-gui.c:1028
+#: mail/mail-account-gui.c:1030
 #, fuzzy
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
@@ -8753,7 +8844,7 @@ msgstr ""
 "\n"
 "Salvare le modifiche?"
 
-#: mail/mail-account-gui.c:1611
+#: mail/mail-account-gui.c:1615
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -8789,7 +8880,7 @@ msgid "Are you sure you want to delete this news account?"
 msgstr "Sicuro di voler cancellare questo aaccount delle news?"
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:757 mail/mail-config.glade.h:42
+#: mail/mail-accounts.c:760 mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Mail Settings"
 msgstr "Impostazioni _Posta..."
@@ -8892,38 +8983,38 @@ msgstr ""
 msgid "This message contains invalid recipients:"
 msgstr ""
 
-#: mail/mail-callbacks.c:453
+#: mail/mail-callbacks.c:454
 msgid "You must specify recipients in order to send this message."
 msgstr "� necessario specificare dei destinatari per inviare questo messaggio."
 
-#: mail/mail-callbacks.c:549
+#: mail/mail-callbacks.c:550
 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:779
+#: mail/mail-callbacks.c:783
 #, fuzzy
 msgid "an unknown sender"
 msgstr "Errore sconosciuto"
 
-#: mail/mail-callbacks.c:784
+#: mail/mail-callbacks.c:788
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1162
+#: mail/mail-callbacks.c:1171
 msgid "Move message(s) to"
 msgstr "Sposta messaggio(i) in"
 
-#: mail/mail-callbacks.c:1164
+#: mail/mail-callbacks.c:1173
 msgid "Copy message(s) to"
 msgstr "Copia messaggio(i) in"
 
-#: mail/mail-callbacks.c:1538
+#: mail/mail-callbacks.c:1547
 #, fuzzy, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Sei sicuro di voler cancellare l'obiettivo `%s'?"
 
-#: mail/mail-callbacks.c:1560
+#: mail/mail-callbacks.c:1569
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -8931,7 +9022,7 @@ msgstr ""
 "� possibile modificare solo i messaggi\n"
 "salvati nella cartella Bozze."
 
-#: mail/mail-callbacks.c:1594
+#: mail/mail-callbacks.c:1603
 #, fuzzy
 msgid ""
 "You may only resend messages\n"
@@ -8940,29 +9031,29 @@ msgstr ""
 "� possibile modificare solo i messaggi\n"
 "salvati nella cartella Bozze."
 
-#: mail/mail-callbacks.c:1606
+#: mail/mail-callbacks.c:1615
 #, fuzzy, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Sei sicuro di voler cancellare l'obiettivo `%s'?"
 
-#: mail/mail-callbacks.c:1627
+#: mail/mail-callbacks.c:1636
 #, fuzzy
 msgid "No Message Selected"
 msgstr "Il messaggio � stato ricevuto"
 
-#: mail/mail-callbacks.c:1712
+#: mail/mail-callbacks.c:1721
 msgid "Save Message As..."
 msgstr "Salva Messaggio con nome..."
 
-#: mail/mail-callbacks.c:1714
+#: mail/mail-callbacks.c:1723
 msgid "Save Messages As..."
 msgstr "Salva messaggi con nome..."
 
-#: mail/mail-callbacks.c:1859 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:1868 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Avviso"
 
-#: mail/mail-callbacks.c:1864
+#: mail/mail-callbacks.c:1873
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8970,12 +9061,12 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1871
+#: mail/mail-callbacks.c:1880
 #, fuzzy
 msgid "Do not ask me again."
 msgstr "Non mostrare questo messagio in futuro."
 
-#: mail/mail-callbacks.c:1976
+#: mail/mail-callbacks.c:1985
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -8984,20 +9075,20 @@ msgstr ""
 "Errore nel caricare le informazioni dei filtri:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1986
+#: mail/mail-callbacks.c:1995
 #, fuzzy
 msgid "Filters"
 msgstr "_Filtri..."
 
-#: mail/mail-callbacks.c:2032
+#: mail/mail-callbacks.c:2041
 msgid "Print Message"
 msgstr "Stampa Messaggio"
 
-#: mail/mail-callbacks.c:2078
+#: mail/mail-callbacks.c:2087
 msgid "Printing of message failed"
 msgstr "Stampa Messaggio non riuscita"
 
-#: mail/mail-callbacks.c:2162
+#: mail/mail-callbacks.c:2171
 #, fuzzy, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Sicuro di voler cancellare questo aaccount delle news?"
@@ -9044,91 +9135,111 @@ msgstr ""
 msgid "Evolution Account Assistant"
 msgstr "Guida agli Account di Evolution"
 
-#: mail/mail-config.c:1486
-#, fuzzy
-msgid "Evolution Shortcuts"
-msgstr "_Barra del Collegamenti di Evolution"
+#: mail/mail-config.c:315
+#, fuzzy, c-format
+msgid "Account %d"
+msgstr "Account"
 
-#. right now, the URL always works basically as a matter of luck...
-#. * both IMAP and mbox spool stores have INBOX as their inbox folder
-#. * name. I don't think this will work with maildir. How can we figure out
-#. * what shortcut to insert?
-#.
 #: mail/mail-config.c:1618
+#, c-format
+msgid ""
+"Could not get inbox for new mail store:\n"
+"%s\n"
+"No shortcut will be created."
+msgstr ""
+
+#. Create the shortcut. FIXME: This only works if the
+#. * full name matches the path.
+#.
+#: mail/mail-config.c:1629
 #, fuzzy, c-format
 msgid "%s: Inbox"
 msgstr "mbox"
 
-#: mail/mail-config.c:1851
+#: mail/mail-config.c:1873
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:1922 mail/mail-config.c:1925
+#: mail/mail-config.c:1944 mail/mail-config.c:1947
 msgid "Connecting to server..."
 msgstr ""
 
 #: mail/mail-config.glade.h:1
+msgid " _Check for supported types "
+msgstr ""
+
+#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid " color"
 msgstr "Colori"
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:3
 #, fuzzy
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "Tipo on supportato"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr "Account"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr "Informazioni sull'Account"
 
-#: mail/mail-config.glade.h:5 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:6 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Gestione degli Account"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "Accounts"
 msgstr "Account"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:10
 msgid "Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:10 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Allegato"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:12
 msgid "Authentication"
 msgstr "Autenticazione"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Authentication Type: "
 msgstr "Tipo di Autenticazione:"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:14
 msgid "Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:16
 #, fuzzy
 msgid "Composer"
 msgstr "Scrivi"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:17
+#, fuzzy
+msgid "Configuration"
+msgstr "Configurazione della Posta"
+
+#: mail/mail-config.glade.h:18
+#, fuzzy
+msgid "Confirm when Expunging a folder"
+msgstr "Eliminazione cartella"
+
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -9144,268 +9255,255 @@ msgstr ""
 "\n"
 "Cliccare su \"Fine\" per salvare le impostazioni."
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr "Pr_edefinito"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:26
 msgid "Default Forward style is: "
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:27
 msgid "Default character encoding: "
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:29
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:30
 msgid "Display"
 msgstr "Visualizza"
 
-#: mail/mail-config.glade.h:27 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:31 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Completato"
 
-#: mail/mail-config.glade.h:28 shell/e-local-storage.c:174
+#: mail/mail-config.glade.h:32 shell/e-local-storage.c:174
 #, fuzzy
 msgid "Drafts"
 msgstr "Bozza"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "Drafts folder:"
 msgstr "Creazione nuova cartella"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:34
 #, fuzzy
 msgid "E_nable"
 msgstr "Come _Tabella"
 
-#: mail/mail-config.glade.h:31
-#, fuzzy
-msgid "Each account must have a different name."
-msgstr "Salva il file corrente con un nome diverso"
-
-#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:96
 #: widgets/misc/e-filter-bar.h:103
 #, fuzzy
 msgid "Edit..."
 msgstr "Modifica"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:36
 msgid "Enabled"
 msgstr ""
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:37
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:38
 #, fuzzy
 msgid "HTML signature file:"
 msgstr "File con la firma:"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:40 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Identit�"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:41
 msgid "In HTML mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Inline"
 msgstr "_In linea"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Kerberos "
 msgstr "Kerberos 4"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:44
 msgid "Mail Configuration"
 msgstr "Configurazione della Posta"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Mailbox location"
 msgstr "Formato della Mailbox"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Make this my _default account"
 msgstr "Imposta come mio account predefinito"
 
-#: mail/mail-config.glade.h:45
-msgid "Message _preview should be displayed by default"
-msgstr ""
-
-#: mail/mail-config.glade.h:46
-msgid "Message list should display in a _threaded fashion by default"
-msgstr ""
-
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "NNTP Server:"
 msgstr "LDAP Server"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:49
 msgid "News"
 msgstr "News"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Optional Information"
 msgstr "Nessuna informazione"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:53
 msgid "PGP Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 msgid "Pick a color"
 msgstr "Prendi un colore"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 #, fuzzy
 msgid "Prompt when sending messages with an _empty subject"
 msgstr "Impossibile inviare il messaggio: senza destinatari."
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr "Impossibile inviare il messaggio: senza destinatari."
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Qmail maildir "
 msgstr "maildir"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid "Quoted"
 msgstr "_Citato"
 
-#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Ricezione Email"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:63
 #, fuzzy
 msgid "Receiving Mail"
 msgstr "Ricezione Email"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:64
 #, fuzzy
 msgid "Receiving Options"
 msgstr "Ricezione"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:65
 #, fuzzy
 msgid "Required Information"
 msgstr "Informazioni Utente"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:67
 msgid "Secure MIME"
 msgstr ""
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:68
 #, fuzzy
 msgid "Security"
 msgstr "_Sicurezza"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Select Filter Log file..."
 msgstr "Scegliere un file"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:70
 msgid "Select PGP binary"
 msgstr "Scegliere un file binario PGP"
 
-#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:71 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Invio Email"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Sending Mail"
 msgstr "Invio Email"
 
-#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:74 mail/message-list.etspec.h:6
 #: shell/e-local-storage.c:177
 #, fuzzy
 msgid "Sent"
 msgstr "Visto"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Messaggio del Calendario"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Sent messages folder:"
 msgstr "Sposta il messaggio in una nuova cartella"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:77
 msgid "Server Configuration"
 msgstr "Configurazione del Server"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 msgid "Server Type: "
 msgstr "Tipo di Server:"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "Server requires _authentication"
 msgstr "Il Server richiede l'autenticazione"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:80
 msgid "Signature file:"
 msgstr "File con la firma:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Source"
 msgstr "Sorgenti"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "Source Information"
 msgstr "Nessuna informazione"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:83
 msgid "Sources"
 msgstr "Sorgenti"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Special Folders"
 msgstr "Cartelle Virtuali"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:85
 #, fuzzy
 msgid "Standard Unix mbox"
 msgstr "File di mailbox standard per Unix"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:87
 msgid "Use secure connection (_SSL)"
 msgstr ""
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -9416,88 +9514,84 @@ msgstr ""
 "\n"
 "Cliccare \"successivo\" per cominciare."
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:92
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:93
 #, fuzzy
 msgid "_Automatically check for new mail every"
 msgstr "Controlla la posta automaticamente ogni"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:94
 msgid "_Check for supported types"
 msgstr ""
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "_Email Address:"
 msgstr "Indirizzo Email:"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:98
 msgid "_Empty trash folders on exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 #, fuzzy
 msgid "_Full Name:"
 msgstr "Nome e cognome:"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "_HTML Signature:"
 msgstr "File con la firma:"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 msgid "_Highlight citations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "_Host:"
 msgstr "Host:"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 msgid "_Log filter actions to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 #, fuzzy
 msgid "_Mark messages as Read after"
 msgstr "Segna i messaggi come \"Letti\" dopo:"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 #, fuzzy
 msgid "_Name:"
 msgstr "Nome:"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 #, fuzzy
 msgid "_Organization:"
 msgstr "Organizzazione:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:109
 #, fuzzy
 msgid "_PGP binary path:"
 msgstr "Percorso binario di PGP:"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "_Path:"
 msgstr "Percorso:"
 
-#: mail/mail-config.glade.h:110
-msgid "_Remember PGP Passphrase until exit"
-msgstr ""
-
 #: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "_Remember this password"
@@ -9535,46 +9629,46 @@ msgstr ""
 msgid "seconds."
 msgstr "secondi."
 
-#: mail/mail-crypto.c:60
+#: mail/mail-crypto.c:59
 #, fuzzy
 msgid "Could not create a PGP signature context."
 msgstr "Impossibile connettersi al server POP su %s"
 
-#: mail/mail-crypto.c:86
+#: mail/mail-crypto.c:84
 #, fuzzy
 msgid "Could not create a PGP verification context."
 msgstr "Impossibile connettersi al server POP su %s"
 
-#: mail/mail-crypto.c:116
+#: mail/mail-crypto.c:113
 #, fuzzy
 msgid "Could not create a PGP encryption context."
 msgstr "Impossibile creare la finestra di composizione."
 
-#: mail/mail-crypto.c:142
+#: mail/mail-crypto.c:138
 #, fuzzy
 msgid "Could not create a PGP decryption context."
 msgstr ""
 "Impossibile creare la directory %s:\n"
 "%s"
 
-#: mail/mail-crypto.c:177
+#: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
 msgstr ""
 
-#: mail/mail-crypto.c:209
+#: mail/mail-crypto.c:205
 msgid "Could not create a S/MIME certsonly context."
 msgstr ""
 
-#: mail/mail-crypto.c:240
+#: mail/mail-crypto.c:236
 msgid "Could not create a S/MIME encryption context."
 msgstr ""
 
-#: mail/mail-crypto.c:271
+#: mail/mail-crypto.c:267
 #, fuzzy
 msgid "Could not create a S/MIME envelope context."
 msgstr "Impossibile creare la finestra di composizione."
 
-#: mail/mail-crypto.c:301
+#: mail/mail-crypto.c:297
 #, fuzzy
 msgid "Could not create a S/MIME decode context."
 msgstr "Impossibile creare la finestra di composizione."
@@ -9622,12 +9716,12 @@ msgstr ""
 msgid "Copy Link Location"
 msgstr "_Contatto"
 
-#: mail/mail-display.c:1519
+#: mail/mail-display.c:1520
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "_Obiettivo"
 
-#: mail/mail-display.c:1521
+#: mail/mail-display.c:1523
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Salva come..."
@@ -9646,91 +9740,91 @@ msgstr "Impossibile aprire la cartella: la lista dei messaggi era incompleta."
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:860
+#: mail/mail-format.c:862
 #, fuzzy
 msgid "Bad Address"
 msgstr "Indirizzo Email:"
 
-#: mail/mail-format.c:882 mail/message-list.etspec.h:3
+#: mail/mail-format.c:903 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "Da"
 
-#: mail/mail-format.c:885
+#: mail/mail-format.c:906
 #, fuzzy
 msgid "Reply-To"
 msgstr "Rispondi-a:"
 
-#: mail/mail-format.c:888 mail/message-list.etspec.h:10
+#: mail/mail-format.c:910 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "A"
 
-#: mail/mail-format.c:891
+#: mail/mail-format.c:914
 #, fuzzy
 msgid "Cc"
 msgstr "Cc:"
 
-#: mail/mail-format.c:1311
+#: mail/mail-format.c:1357
 #, fuzzy
 msgid "No GPG/PGP program configured."
 msgstr "Programma GPG/PGP non disponibile."
 
-#: mail/mail-format.c:1327
+#: mail/mail-format.c:1373
 msgid "Encrypted message not displayed"
 msgstr "Messaggi cifrati non visualizzati"
 
-#: mail/mail-format.c:1338
+#: mail/mail-format.c:1384
 msgid "Encrypted message"
 msgstr "Messaggio cifrato"
 
-#: mail/mail-format.c:1339
+#: mail/mail-format.c:1385
 msgid "Click icon to decrypt."
 msgstr "Cliccare l'icona per decifrare."
 
-#: mail/mail-format.c:1394
+#: mail/mail-format.c:1440
 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:1405
+#: mail/mail-format.c:1451
 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:2083
+#: mail/mail-format.c:2128
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Puntatore al sito FTP (%s)"
 
-#: mail/mail-format.c:2097
+#: mail/mail-format.c:2142
 #, 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:2102
+#: mail/mail-format.c:2147
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Puntatore a un file locale (%s)"
 
-#: mail/mail-format.c:2131
+#: mail/mail-format.c:2176
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Puntatore al sito FTP (%s)"
 
-#: mail/mail-format.c:2139
+#: mail/mail-format.c:2184
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Puntatore a dati esterni sconosciuti (tipo \"%s\")"
 
-#: mail/mail-format.c:2144
+#: mail/mail-format.c:2189
 msgid "Malformed external-body part."
 msgstr "Parte esterna del messaggio malformata."
 
-#: mail/mail-local.c:547
+#: mail/mail-local.c:563
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "Riconfigura Cartella"
 
-#: mail/mail-local.c:620
+#: mail/mail-local.c:636
 #, fuzzy, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -9739,29 +9833,29 @@ msgstr ""
 "Impossibile salvare le metainfo della cartella; probabilmente non \n"
 "sar� pi� possibile riaprire questa cartella: %s"
 
-#: mail/mail-local.c:676
+#: mail/mail-local.c:689
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Impossibile avere la cartella %s: %s"
 
-#: mail/mail-local.c:722
+#: mail/mail-local.c:735
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 "Impossibile cancellare la cartella `%s':\n"
 "%s"
 
-#: mail/mail-local.c:1052
+#: mail/mail-local.c:1075
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Cambiamento del formato della cartella da  \"%s\" a  \"%s\" "
 
-#: mail/mail-local.c:1067
+#: mail/mail-local.c:1090
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1089
+#: mail/mail-local.c:1112
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -9769,16 +9863,16 @@ msgstr ""
 "Se non si riesce pi� ad aprire questa mailbox, pu� essere necessario\n"
 "ripararla manualmente."
 
-#: mail/mail-local.c:1180
+#: mail/mail-local.c:1200
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-local.c:1190
+#: mail/mail-local.c:1209
 #, fuzzy, c-format
-msgid "Reconfigure %s"
+msgid "Reconfigure /%s"
 msgstr "Configura %s"
 
-#: mail/mail-mt.c:188
+#: mail/mail-mt.c:199
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -9787,7 +9881,7 @@ msgstr ""
 "Errore durante '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:191
+#: mail/mail-mt.c:202
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -9797,21 +9891,25 @@ msgstr ""
 "%s"
 
 #. Remember the password?
-#: mail/mail-mt.c:454
+#: mail/mail-mt.c:509
 msgid "Remember this password"
 msgstr "Ricorda questa password"
 
-#: mail/mail-mt.c:511
+#: mail/mail-mt.c:510
+msgid "Remember this password for the remainder of this session"
+msgstr ""
+
+#: mail/mail-mt.c:567
 #, fuzzy, c-format
 msgid "Enter Password for %s"
 msgstr "Inserire la password per %s"
 
-#: mail/mail-mt.c:514
+#: mail/mail-mt.c:570
 #, fuzzy
 msgid "Enter Password"
 msgstr "Inserire la password per %s"
 
-#: mail/mail-mt.c:824
+#: mail/mail-mt.c:886
 msgid "Working"
 msgstr "Sto lavorando"
 
@@ -9969,6 +10067,11 @@ msgstr "Impossibile srivere i dati: %s"
 msgid "Disconnecting from %s"
 msgstr ""
 
+#: mail/mail-ops.c:2065
+#, fuzzy, c-format
+msgid "Reconnecting to %s"
+msgstr "Apertura archivio %s"
+
 #: mail/mail-search-dialogue.c:113
 msgid "_Search"
 msgstr "_Cerca"
@@ -10032,12 +10135,12 @@ msgstr ""
 msgid "Type: %s"
 msgstr "Tipo:"
 
-#: mail/mail-send-recv.c:282
+#: mail/mail-send-recv.c:283
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "Invia e Ricevi la posta"
 
-#: mail/mail-send-recv.c:283
+#: mail/mail-send-recv.c:284
 #, fuzzy
 msgid "Cancel All"
 msgstr "Annullato"
@@ -10060,36 +10163,50 @@ msgstr "Annullato."
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-tools.c:173
+#: mail/mail-tools.c:133
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Impossibile creare una mbox temporanea `%s': %s"
 
-#: mail/mail-tools.c:299
+#: mail/mail-tools.c:259
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Messaggio inoltrato - %s"
 
-#: mail/mail-tools.c:303
+#: mail/mail-tools.c:263
 #, fuzzy
 msgid "Forwarded message"
 msgstr "Messaggio inoltrato"
 
-#: mail/mail-tools.c:439
+#: mail/mail-tools.c:396
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "Messaggio inoltrato"
 
-#: mail/mail-vfolder.c:161
+#: mail/mail-vfolder.c:84
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Apertura cartella %s"
 
-#: mail/mail-vfolder.c:435
+#: mail/mail-vfolder.c:201
+#, fuzzy, c-format
+msgid "Updating vfolders for uri: %s"
+msgstr "Scansione delle cartelle in \"%s\" in corso"
+
+#: mail/mail-vfolder.c:414
+#, c-format
+msgid ""
+"The following vFolder(s):\n"
+"%sUsed the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+
+#: mail/mail-vfolder.c:636
 msgid "VFolders"
 msgstr "Cartelle virtuali"
 
-#: mail/mail-vfolder.c:541
+#: mail/mail-vfolder.c:742
 msgid "New VFolder"
 msgstr "Nuova Cartella Virtuale"
 
@@ -10159,7 +10276,7 @@ msgstr "%a %I:%M %p"
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2331
+#: mail/message-list.c:2334
 #, fuzzy
 msgid "Generating message list"
 msgstr "Salvataggio messaggi"
@@ -10252,36 +10369,36 @@ msgstr "Annulla iscrizione"
 msgid "Evolution component for the executive summary."
 msgstr "Componente di Evolution per il sommario esecutivo."
 
-#: my-evolution/component-factory.c:30
+#: my-evolution/component-factory.c:45
 msgid "Folder containing the Evolution Summary"
 msgstr ""
 
-#: my-evolution/component-factory.c:139
+#: my-evolution/component-factory.c:154
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr ""
 "Impossibile inizializzare il componente del Sommario Esecutivo di Evolution."
 
-#: my-evolution/e-summary-calendar.c:248 my-evolution/e-summary-calendar.c:266
+#: my-evolution/e-summary-calendar.c:263 my-evolution/e-summary-calendar.c:281
 #, fuzzy
 msgid "Appointments"
 msgstr "Appuntamento"
 
-#: my-evolution/e-summary-calendar.c:249
+#: my-evolution/e-summary-calendar.c:264
 #, fuzzy
 msgid "No appointments"
 msgstr "Mostra appuntamenti"
 
-#: my-evolution/e-summary-calendar.c:286
+#: my-evolution/e-summary-calendar.c:301
 #, fuzzy
 msgid "%k%M %d %B"
 msgstr "%A %d %B"
 
-#: my-evolution/e-summary-calendar.c:288
+#: my-evolution/e-summary-calendar.c:303
 #, fuzzy
 msgid "%l:%M %d %B"
 msgstr "%A %d %B"
 
-#: my-evolution/e-summary-mail.c:115
+#: my-evolution/e-summary-mail.c:130
 #, fuzzy
 msgid "Mail summary"
 msgstr "Niente indice"
@@ -10290,91 +10407,91 @@ msgstr "Niente indice"
 #. see in My Evolution by default. You can find the list of all
 #. stations and their codes in Evolution sources
 #. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-preferences.c:65
-#: my-evolution/e-summary-weather.c:615
+#: my-evolution/e-summary-preferences.c:80
+#: my-evolution/e-summary-weather.c:630
 msgid "KBOS:ZSAM:EGAA"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:427
+#: my-evolution/e-summary-preferences.c:441
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:449
+#: my-evolution/e-summary-preferences.c:463
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:890
+#: my-evolution/e-summary-preferences.c:929
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:898
+#: my-evolution/e-summary-preferences.c:937
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:902
+#: my-evolution/e-summary-preferences.c:941
 msgid "Name:"
 msgstr "Nome:"
 
-#: my-evolution/e-summary-preferences.c:1438
+#: my-evolution/e-summary-preferences.c:1486
 #, fuzzy
 msgid "Summary Settings"
 msgstr "Email contiene"
 
-#: my-evolution/e-summary-rdf.c:277 my-evolution/e-summary-rdf.c:362
-#: my-evolution/e-summary-rdf.c:395
+#: my-evolution/e-summary-rdf.c:297 my-evolution/e-summary-rdf.c:382
+#: my-evolution/e-summary-rdf.c:415
 #, fuzzy
 msgid "Error downloading RDF"
 msgstr "<b>Errore nel caricare il calendario</b>"
 
-#: my-evolution/e-summary-rdf.c:487
+#: my-evolution/e-summary-rdf.c:507
 #, fuzzy
 msgid "News Feed"
 msgstr "_Nuova Cartella"
 
-#: my-evolution/e-summary-tasks.c:216
+#: my-evolution/e-summary-tasks.c:238
 #, fuzzy
 msgid "No tasks"
 msgstr "Mostra obiettivi"
 
-#: my-evolution/e-summary-tasks.c:255
+#: my-evolution/e-summary-tasks.c:277
 #, fuzzy
 msgid "(No Description)"
 msgstr "Descrizione:"
 
-#: my-evolution/e-summary-weather.c:57
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:334
+#: my-evolution/e-summary-weather.c:349
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:524
+#: my-evolution/e-summary-weather.c:539
 #, fuzzy
 msgid "Weather"
 msgstr "Altro"
 
-#: my-evolution/e-summary-weather.c:676
+#: my-evolution/e-summary-weather.c:691
 #, fuzzy
 msgid "Regions"
 msgstr "Sezioni:"
 
-#: my-evolution/e-summary.c:162
+#: my-evolution/e-summary.c:187
 #, fuzzy
 msgid "%A, %B %e %Y"
 msgstr "%A, %B %d, %Y"
 
-#: my-evolution/e-summary.c:512 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:568 ui/my-evolution.xml.h:3
 #, fuzzy
 msgid "Print Summary"
 msgstr "Indice"
 
-#: my-evolution/e-summary.c:558
+#: my-evolution/e-summary.c:614
 #, fuzzy
 msgid "Printing of Summary failed"
 msgstr "Stampa Messaggio non riuscita"
 
-#: my-evolution/main.c:52
+#: my-evolution/main.c:67
 #, fuzzy
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "init_bonobo(): impossibile inizializzare Bonobo"
@@ -11843,43 +11960,43 @@ msgstr ""
 "directorydi Evolution. Spostarla per permettere \n"
 "l'installazione dei file utente di Evolution."
 
-#: shell/e-shell-folder-commands.c:174
+#: shell/e-shell-folder-commands.c:176
 #, fuzzy
 msgid "Cannot move a folder over itself."
 msgstr "Impossibile avere la cartella %s: %s"
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:178
 #, fuzzy
 msgid "Cannot copy a folder over itself."
 msgstr ""
 "Impossibile copiare i file in\n"
 "`%s'"
 
-#: shell/e-shell-folder-commands.c:190
+#: shell/e-shell-folder-commands.c:192
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:294
+#: shell/e-shell-folder-commands.c:312
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:299
+#: shell/e-shell-folder-commands.c:317
 #, fuzzy
 msgid "Copy folder"
 msgstr "Copia nella Cartella"
 
-#: shell/e-shell-folder-commands.c:337
+#: shell/e-shell-folder-commands.c:359
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:342
+#: shell/e-shell-folder-commands.c:364
 #, fuzzy
 msgid "Move folder"
 msgstr "Sposta nella Cartella..."
 
-#: shell/e-shell-folder-commands.c:367
+#: shell/e-shell-folder-commands.c:390
 #, fuzzy, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -11888,34 +12005,35 @@ msgstr ""
 "Impossibile cancellare la cartella `%s':\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:383
+#: shell/e-shell-folder-commands.c:406
 #, fuzzy, c-format
-msgid "Delete folder '%s'"
-msgstr "Elimina questo obiettivo"
+msgid "Delete \"%s\""
+msgstr "Elimina"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:393
+#: shell/e-shell-folder-commands.c:416
 #, fuzzy, c-format
-msgid "Are you sure you want to remove the '%s' folder?"
+msgid "Are you sure you want to remove the \"%s\" folder?"
 msgstr "Sei sicuro di voler cancellare l'obiettivo `%s'?"
 
-#. Popup a dialog asking what the user would like to rename
-#. the folder to
-#: shell/e-shell-folder-commands.c:468
+#: shell/e-shell-folder-commands.c:470
 #, fuzzy, c-format
-msgid "Rename folder '%s'"
+msgid ""
+"Cannot rename folder:\n"
+"%s"
+msgstr ""
+"Impossibile cancellare la cartella `%s':\n"
+"%s"
+
+#: shell/e-shell-folder-commands.c:503
+#, fuzzy, c-format
+msgid "Rename the \"%s\" folder to:"
 msgstr "Apertura cartella %s"
 
-#: shell/e-shell-folder-commands.c:472
+#: shell/e-shell-folder-commands.c:506
 #, fuzzy
-msgid "Rename"
-msgstr "Nome della Regola:"
-
-#. Make, pack the label
-#: shell/e-shell-folder-commands.c:480
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "Nome della cartella:"
+msgid "Rename folder"
+msgstr "Apertura cartella %s"
 
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
@@ -11953,7 +12071,7 @@ msgstr "Il nome specificato della cartella non � valido."
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Crea nuova cartella"
 
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:99
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -11961,7 +12079,7 @@ msgstr ""
 "Il tipo di cartella selezionata non � valido\n"
 "per l'operazione richiesta. "
 
-#: shell/e-shell-folder-selection-dialog.c:348
+#: shell/e-shell-folder-selection-dialog.c:360
 msgid "New..."
 msgstr "Nuovo..."
 
@@ -11969,7 +12087,11 @@ msgstr "Nuovo..."
 msgid "(Untitled)"
 msgstr "(Senza nome)"
 
-#: shell/e-shell-importer.c:102
+#: shell/e-shell-importer.c:141
+msgid "Choose the type of importer to run"
+msgstr ""
+
+#: shell/e-shell-importer.c:144
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -11983,9 +12105,13 @@ msgstr ""
 "Si pu� selezionare \"Automatico\" se non si conosce, Evolution tenter� di "
 "arrangiarsi."
 
+#: shell/e-shell-importer.c:150
+msgid "Please select the information that you would like to import"
+msgstr ""
+
 #. Importer isn't ready yet.
 #. Wait 5 seconds and try again.
-#: shell/e-shell-importer.c:197
+#: shell/e-shell-importer.c:242
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11996,7 +12122,7 @@ msgstr ""
 "Importatore non pronto.\n"
 "Attendere 5 secondi per riprovare."
 
-#: shell/e-shell-importer.c:217 shell/e-shell-importer.c:248
+#: shell/e-shell-importer.c:262 shell/e-shell-importer.c:293
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -12005,16 +12131,16 @@ msgstr ""
 "Importazione %s\n"
 "Importazione dell'oggetto %d."
 
-#: shell/e-shell-importer.c:351
+#: shell/e-shell-importer.c:396
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "La cartella `%s' non esiste."
 
-#: shell/e-shell-importer.c:363
+#: shell/e-shell-importer.c:408
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:378
+#: shell/e-shell-importer.c:423
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -12023,11 +12149,11 @@ msgstr ""
 "Non c'� un importatore adatto a gestire\n"
 "%s"
 
-#: shell/e-shell-importer.c:388
+#: shell/e-shell-importer.c:433
 msgid "Importing"
 msgstr "Importazione"
 
-#: shell/e-shell-importer.c:396
+#: shell/e-shell-importer.c:441
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -12036,17 +12162,17 @@ msgstr ""
 "Importazione di %s.\n"
 "Avvio di %s"
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:454
 #, fuzzy, c-format
 msgid "Error starting %s"
 msgstr "Errore nel caricare: %s"
 
-#: shell/e-shell-importer.c:428
+#: shell/e-shell-importer.c:473
 #, c-format
 msgid "Error loading %s"
 msgstr "Errore nel caricare: %s"
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:490
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -12055,32 +12181,56 @@ msgstr ""
 "Importazione %s\n"
 "Importazione dell'oggetto 1."
 
-#: shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:560
 msgid "Automatic"
 msgstr "Automatico"
 
-#: shell/e-shell-importer.c:566
+#: shell/e-shell-importer.c:611
 msgid "Filename:"
 msgstr "Nome del file:"
 
-#: shell/e-shell-importer.c:571
+#: shell/e-shell-importer.c:616
 msgid "Select a file"
 msgstr "Scegliere un file"
 
-#: shell/e-shell-importer.c:581
+#: shell/e-shell-importer.c:626
 msgid "File type:"
 msgstr "Tipo di file:"
 
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:651
+msgid "Import data and settings from older programs"
+msgstr ""
+
+#: shell/e-shell-importer.c:655
+#, fuzzy
+msgid "Import a single file"
+msgstr "Importa un formato di file esterno"
+
+#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:582
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:585
+msgid "Starting Intelligent Importers"
+msgstr ""
+
+#: shell/e-shell-importer.c:840 shell/e-shell-startup-wizard.c:703
+#, fuzzy, c-format
+msgid "From %s:"
+msgstr "Da:"
+
+#: shell/e-shell-importer.c:1003
 #, fuzzy
 msgid "Select folder"
 msgstr "Scegli Cartella"
 
-#: shell/e-shell-importer.c:646
+#: shell/e-shell-importer.c:1004
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:689 shell/importer/intelligent.c:194
+#: shell/e-shell-importer.c:1116 shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "Importa"
 
@@ -12100,45 +12250,30 @@ msgstr ""
 msgid "Cannot initialize the Evolution Mailer Wizard interface"
 msgstr "Impossibile inizializzare il componente della posta di Evolution."
 
-#: shell/e-shell-startup-wizard.c:582
-msgid ""
-"Please wait...\n"
-"Scanning for existing setups"
-msgstr ""
-
-#: shell/e-shell-startup-wizard.c:585
-msgid "Starting Intelligent Importers"
-msgstr ""
-
-#: shell/e-shell-startup-wizard.c:703
-#, fuzzy, c-format
-msgid "From %s:"
-msgstr "Da:"
-
 #: shell/e-shell-startup-wizard.c:745
 msgid ""
 "Please select the information\n"
 "that you would like to import"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:183
+#: shell/e-shell-view-menu.c:201
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Impossibile trovare Bug Buddy nel tuo $PATH. "
 
-#: shell/e-shell-view-menu.c:191
+#: shell/e-shell-view-menu.c:209
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy non pu� essere eseguito."
 
-#: shell/e-shell-view-menu.c:217
+#: shell/e-shell-view-menu.c:235
 #, fuzzy
 msgid "Ximian Evolution"
 msgstr "Evolution"
 
-#: shell/e-shell-view-menu.c:219
+#: shell/e-shell-view-menu.c:237
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:221
+#: shell/e-shell-view-menu.c:239
 #, fuzzy
 msgid ""
 "Ximian Evolution is a suite of groupware applications\n"
@@ -12149,29 +12284,38 @@ msgstr ""
 "per posta, calendario e gestione dei contatti\n"
 "nell'ambito dell'ambiente GNOME desktop.  "
 
-#: shell/e-shell-view-menu.c:424
+#: shell/e-shell-view-menu.c:442
 msgid "Go to folder..."
 msgstr "Vai alla cartella..."
 
-#: shell/e-shell-view-menu.c:425
+#: shell/e-shell-view-menu.c:443
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:570
+#: shell/e-shell-view-menu.c:563
 #, fuzzy
 msgid "Create a new shortcut"
 msgstr "Crea un nuovo gruppo di collegamento"
 
-#: shell/e-shell-view-menu.c:571
+#: shell/e-shell-view-menu.c:564
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:685
+#: shell/e-shell-view-menu.c:595
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:603
+#, fuzzy, c-format
+msgid "Error executing %s."
+msgstr "Errore nell'esecuzione del filtro: %s: %s"
+
+#: shell/e-shell-view-menu.c:705
 #, fuzzy
 msgid "Work Online"
 msgstr "Non collegato"
 
-#: shell/e-shell-view-menu.c:698 shell/e-shell-view-menu.c:711
+#: shell/e-shell-view-menu.c:718 shell/e-shell-view-menu.c:731
 #: ui/evolution.xml.h:30
 msgid "Work Offline"
 msgstr "Non collegato"
@@ -12180,46 +12324,46 @@ msgstr "Non collegato"
 msgid "(No folder displayed)"
 msgstr "(Nessuna cartella mostrata)"
 
-#: shell/e-shell-view.c:1478
+#: shell/e-shell-view.c:1512
 #, c-format
 msgid "%s (%d)"
 msgstr ""
 
-#: shell/e-shell-view.c:1480
+#: shell/e-shell-view.c:1514
 #, fuzzy
 msgid "(None)"
 msgstr "(Senza nome)"
 
-#: shell/e-shell-view.c:1485
+#: shell/e-shell-view.c:1519
 #, fuzzy, c-format
 msgid "%s - Ximian Evolution %s"
 msgstr "%s -Evolution %s"
 
-#: shell/e-shell-view.c:1487
+#: shell/e-shell-view.c:1521
 #, fuzzy, c-format
 msgid "%s - Ximian Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell-view.c:1527
+#: shell/e-shell-view.c:1561
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1534
+#: shell/e-shell-view.c:1568
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1540
+#: shell/e-shell-view.c:1574
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:560
+#: shell/e-shell.c:562
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Impossibile impostare il local storage --%s"
 
-#: shell/e-shell.c:1496
+#: shell/e-shell.c:1488
 #, fuzzy, c-format
 msgid ""
 "Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
@@ -12228,24 +12372,24 @@ msgstr ""
 "Ooops! La visualizzazione di `%s' � morta inaspettatamente. :-(\\n\n"
 "Il che significa che probabilmente il componente %s si � impallato"
 
-#: shell/e-shell.c:1700 widgets/misc/e-cell-date-edit.c:248
+#: shell/e-shell.c:1692 widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "OK"
 
-#: shell/e-shell.c:1702
+#: shell/e-shell.c:1694
 #, fuzzy
 msgid "Invalid arguments"
 msgstr "Contenuto del messaggio non valido"
 
-#: shell/e-shell.c:1704
+#: shell/e-shell.c:1696
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:1706
+#: shell/e-shell.c:1698
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:1708 shell/e-storage.c:491
+#: shell/e-shell.c:1700 shell/e-storage.c:496
 msgid "Generic error"
 msgstr "Errore generico"
 
@@ -12382,52 +12526,61 @@ msgstr "Errore di salvataggio dei collegamenti."
 msgid "Shortcuts"
 msgstr "_Barra di Collegamento"
 
+#: shell/e-storage-set-view.c:645
+#, fuzzy, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr ""
+"Impossibile cancellare la cartella `%s':\n"
+"%s"
+
 #: shell/e-storage.c:182 shell/e-storage.c:188
 msgid "(No name)"
 msgstr "(Senza nome)"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:494
 msgid "No error"
 msgstr "Nessun errore"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:498
 msgid "A folder with the same name already exists"
 msgstr "Esiste gi� una cartella con questo nome"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:500
 msgid "The specified folder type is not valid"
 msgstr "Il tipo di cartella specificato non � valido"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:502
 msgid "I/O error"
 msgstr "Errore I/O"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:504
 msgid "Not enough space to create the folder"
 msgstr "Spazio insufficiente per creare la cartella"
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:506
 msgid "The specified folder was not found"
 msgstr "Cartella non trovata"
 
-#: shell/e-storage.c:503
+#: shell/e-storage.c:508
 msgid "Function not implemented in this storage"
 msgstr "Funzione non implementata"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:512
 msgid "Operation not supported"
 msgstr "Operazione non supportata"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:514
 msgid "The specified type is not supported in this storage"
 msgstr "Tipo on supportato"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:516
 #, fuzzy
 msgid "The specified folder cannot be modified or removed"
 msgstr "Cartella non trovata"
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:518
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
@@ -12459,6 +12612,10 @@ msgstr "Host:"
 msgid "The following connections are currently active:"
 msgstr ""
 
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr "Nome della cartella:"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder type:"
 msgstr "Tipo di cartella:"
@@ -12516,15 +12673,25 @@ msgid "Evolution Importer Assistant"
 msgstr "Utilit� Importatore di Evolution"
 
 #: shell/importer/import.glade.h:4
-msgid "Import File (Step 2 of 2)"
-msgstr ""
+#, fuzzy
+msgid "Import File (step 3 of 3)"
+msgstr "Scegliere un file"
 
 #: shell/importer/import.glade.h:5
+msgid "Importer Type (step 1 of 3)"
+msgstr ""
+
+#: shell/importer/import.glade.h:6
 #, fuzzy
-msgid "Select a File (step 1 of 2)"
+msgid "Select Importers (step 2 of 3)"
 msgstr "Scegliere un file"
 
-#: shell/importer/import.glade.h:6
+#: shell/importer/import.glade.h:7
+#, fuzzy
+msgid "Select a File (step 2 of 3)"
+msgstr "Scegliere un file"
+
+#: shell/importer/import.glade.h:8
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
@@ -12769,13 +12936,6 @@ msgstr "_Ceca Contatti"
 msgid "_Select All"
 msgstr "_Seleziona Tutto"
 
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:44
-#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
-#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:19
-#: ui/my-evolution.xml.h:9
-msgid "_Tools"
-msgstr "S_trumenti"
-
 #: ui/evolution-calendar.xml.h:2
 msgid "Configure the calendar's settings"
 msgstr ""
@@ -12968,8 +13128,8 @@ msgstr "Cambia la vista con %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:49
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:36
 msgid "_File"
 msgstr "_File"
@@ -12990,8 +13150,8 @@ msgstr "Salva il contatto e chiudi la finestra di dialogo"
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:54
-#: ui/evolution-signature-editor.xml.h:11
+#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Save"
 msgstr "_Salva"
 
@@ -13675,6 +13835,11 @@ msgstr "Visualizza"
 msgid "_Open Message"
 msgstr "Messaggio del Calendario"
 
+#: ui/evolution-mail-message.xml.h:98 ui/evolution.xml.h:49
+#: ui/my-evolution.xml.h:9
+msgid "_Tools"
+msgstr "S_trumenti"
+
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Chiudi questa finestra"
@@ -13686,8 +13851,8 @@ msgstr "Chiudi questa finestra"
 msgid "_Close"
 msgstr "_Chiudi"
 
-#: ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:48
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:50
 msgid "_View"
 msgstr "_Visualizza"
 
@@ -13854,37 +14019,32 @@ msgid "_Cc Field"
 msgstr "Campo _Cc"
 
 #: ui/evolution-message-composer.xml.h:46
-#: ui/evolution-signature-editor.xml.h:6
-msgid "_Debug"
-msgstr "_Debug"
-
-#: ui/evolution-message-composer.xml.h:47
 #, fuzzy
 msgid "_Delete all"
 msgstr "_Elimina"
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:49
 msgid "_From Field"
 msgstr "Campo _Da"
 
-#: ui/evolution-message-composer.xml.h:51
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-signature-editor.xml.h:9
 msgid "_Insert"
 msgstr "_Inserisci"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:51
 msgid "_Open..."
 msgstr "_Apri..."
 
-#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Reply-To Field"
 msgstr "Campo _Rispondi-a:"
 
-#: ui/evolution-message-composer.xml.h:55
+#: ui/evolution-message-composer.xml.h:54
 msgid "_Security"
 msgstr "_Sicurezza"
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "_Aiuto"
 
@@ -14035,8 +14195,8 @@ msgid "Exit the program"
 msgstr "Esci dal Programma"
 
 #: ui/evolution.xml.h:15
-msgid "Import an external file format"
-msgstr "Importa un formato di file esterno"
+msgid "Import data from other programs"
+msgstr ""
 
 #: ui/evolution.xml.h:17
 #, fuzzy
@@ -14117,8 +14277,8 @@ msgstr "_Vai alla cartella..."
 
 #: ui/evolution.xml.h:41
 #, fuzzy
-msgid "_Import File..."
-msgstr "_Importa un file..."
+msgid "_Import..."
+msgstr "Importazione"
 
 #: ui/evolution.xml.h:42
 #, fuzzy
@@ -14135,19 +14295,24 @@ msgstr "_Nuova Cartella"
 
 #: ui/evolution.xml.h:45
 #, fuzzy
+msgid "_Pilot Settings..."
+msgstr "Impostazioni _Posta..."
+
+#: ui/evolution.xml.h:46
+#, fuzzy
 msgid "_Rename..."
 msgstr "_Apri..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:47
 #, fuzzy
 msgid "_Shortcut"
 msgstr "_Barra di Collegamento"
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:48
 msgid "_Shortcut Bar"
 msgstr "_Barra di Collegamento"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:51
 #, fuzzy
 msgid "_Work Offline"
 msgstr "Non collegato"
@@ -14259,11 +14424,11 @@ msgstr "LMMGVSD"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:433
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:439
 msgid "Now"
 msgstr "Adesso"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:445
 msgid "Today"
 msgstr "Oggi"
 
@@ -14418,21 +14583,60 @@ msgstr "Server Personale della Rubrica"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "Server personale del Calendario; fabbrica del calendario"
 
-#: wombat/wombat.c:175
+#: wombat/wombat.c:176
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): impossibile inizializzare GNOME-VFS"
 
-#: wombat/wombat.c:187
+#: wombat/wombat.c:188
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): impossibile inizializzare GNOME"
 
-#: wombat/wombat.c:200
+#: wombat/wombat.c:201
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): impossibile inizializzare Bonobo"
 
 #, fuzzy
-#~ msgid "Cannot open folder: %s: No such folder"
-#~ msgstr "Impossibile avere la cartella %s: %s"
+#~ msgid "_Calendar Information:"
+#~ msgstr "informazioni sul calendario"
+
+#~ msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
+#~ msgstr ""
+#~ "la priorit� dev'essere 'Alta', 'Normale', 'Bassa' oppure 'Non definita.'"
+
+#, fuzzy
+#~ msgid "before start of appointment"
+#~ msgstr " prima dell'inizio di un appuntamento"
+
+#, fuzzy
+#~ msgid "after start of appointment"
+#~ msgstr " dopo l'inizio di un appuntamento"
+
+#, fuzzy
+#~ msgid "before end of appointment"
+#~ msgstr " prima della fine di un appuntamento"
+
+#, fuzzy
+#~ msgid "Evolution Shortcuts"
+#~ msgstr "_Barra del Collegamenti di Evolution"
+
+#, fuzzy
+#~ msgid "Each account must have a different name."
+#~ msgstr "Salva il file corrente con un nome diverso"
+
+#, fuzzy
+#~ msgid "Delete folder '%s'"
+#~ msgstr "Elimina questo obiettivo"
+
+#, fuzzy
+#~ msgid "Rename"
+#~ msgstr "Nome della Regola:"
+
+#~ msgid "_Debug"
+#~ msgstr "_Debug"
+
+#, fuzzy
+#~ msgid "_Import File..."
+#~ msgstr "_Importa un file..."
 
 #~ msgid "Factory for the Evolution addressbook component."
 #~ msgstr "Fabbrica per il componente della rubrica di Evolution."
@@ -15221,9 +15425,6 @@ msgstr "init_bonobo(): impossibile inizializzare Bonobo"
 #~ msgid "Renaming old folder and opening"
 #~ msgstr "Rinomina vecchia cartella e apertura in corso"
 
-#~ msgid "Copying messages"
-#~ msgstr "Copia messaggi"
-
 #~ msgid "Do you accept?"
 #~ msgstr "Accetti?"
 
diff --git a/po/ja.po b/po/ja.po
index b792eea6b0..df98a05cf7 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: 2001-09-21 18:31-0400\n"
+"POT-Creation-Date: 2001-10-01 19:06-0400\n"
 "PO-Revision-Date: 2001-10-01 00:28+0900\n"
 "Last-Translator: Takuo KITAME <kitame@debian.org>\n"
 "Language-Team: Japanese <translation@gnome.gr.jp>\n"
@@ -33,276 +33,276 @@ msgid "Name"
 msgstr "̾��"
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-msgid "Family Name"
-msgstr "��"
-
-#: addressbook/backend/ebook/e-card-simple.c:61
 #: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Email"
 msgstr "�᡼��"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:61
 #: addressbook/gui/contact-editor/e-contact-editor.c:1609
 msgid "Primary"
 msgstr "�ץ饤�ޥ�"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:61
 msgid "Prim"
 msgstr "�ץ饤�ޥ�"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:92
 #: addressbook/gui/contact-editor/e-contact-editor.c:1594
 #: addressbook/gui/widgets/e-addressbook-view.c:902
 msgid "Assistant"
 msgstr "�����������"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/gui/contact-editor/e-contact-editor.c:1595
 #: addressbook/gui/contact-editor/e-contact-editor.c:1662
 msgid "Business"
 msgstr "�Ż�"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/backend/ebook/e-card-simple.c:68
 msgid "Bus"
 msgstr "�Ż�"
 
-#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/gui/contact-editor/e-contact-editor.c:1598
 msgid "Callback"
 msgstr "�Ƥ��ᤷ"
 
-#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/gui/contact-editor/e-contact-editor.c:1600
 msgid "Company"
 msgstr "���"
 
-#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:65
 msgid "Comp"
 msgstr "���"
 
-#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:69
 #: addressbook/gui/contact-editor/e-contact-editor.c:1601
 #: addressbook/gui/contact-editor/e-contact-editor.c:1663
 msgid "Home"
 msgstr "��"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:67
 #: addressbook/gui/widgets/e-addressbook-view.c:877
 msgid "Organization"
 msgstr "���"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:67
 msgid "Org"
 msgstr "���"
 
-#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/e-contact-editor.c:1605
 msgid "Mobile"
 msgstr "�����"
 
-#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/e-contact-editor.c:1599
 msgid "Car"
 msgstr "��"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/e-contact-editor.c:1597
 #: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "Business Fax"
 msgstr "�Ż��� FAX"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/backend/ebook/e-card-simple.c:72
 msgid "Bus Fax"
 msgstr "�Ż��� FAX"
 
-#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/backend/ebook/e-card-simple.c:73
 #: addressbook/gui/contact-editor/e-contact-editor.c:1603
 #: addressbook/gui/widgets/e-addressbook-view.c:883
 msgid "Home Fax"
 msgstr "�Ȥ� FAX"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/e-contact-editor.c:1596
 msgid "Business 2"
 msgstr "�Ż� 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/backend/ebook/e-card-simple.c:74
 msgid "Bus 2"
 msgstr "�Ż� 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/backend/ebook/e-card-simple.c:75
 #: addressbook/gui/contact-editor/e-contact-editor.c:1602
 msgid "Home 2"
 msgstr "�� 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/backend/ebook/e-card-simple.c:76
 #: addressbook/gui/contact-editor/e-contact-editor.c:1604
 #: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/backend/ebook/e-card-simple.c:83
 #: addressbook/gui/contact-editor/e-contact-editor.c:1606
 #: addressbook/gui/contact-editor/e-contact-editor.c:1664
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:52
 msgid "Other"
 msgstr "����¾"
 
-#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/backend/ebook/e-card-simple.c:78
 #: addressbook/gui/contact-editor/e-contact-editor.c:1607
 #: addressbook/gui/widgets/e-addressbook-view.c:888
 msgid "Other Fax"
 msgstr "����¾�� FAX"
 
-#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/gui/contact-editor/e-contact-editor.c:1608
 #: addressbook/gui/widgets/e-addressbook-view.c:889
 msgid "Pager"
 msgstr "�ݥ��٥�"
 
-#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/backend/ebook/e-card-simple.c:80
 #: addressbook/gui/contact-editor/e-contact-editor.c:1610
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 msgid "Radio"
 msgstr "�饸��"
 
-#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/backend/ebook/e-card-simple.c:81
 #: addressbook/gui/contact-editor/e-contact-editor.c:1611
 #: addressbook/gui/widgets/e-addressbook-view.c:891
 msgid "Telex"
 msgstr "�ƥ�å���"
 
-#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/backend/ebook/e-card-simple.c:82
 #: addressbook/gui/widgets/e-addressbook-view.c:892
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/backend/ebook/e-card-simple.c:84
 #: addressbook/gui/component/e-address-popup.c:476
 #: addressbook/gui/contact-editor/e-contact-editor.c:1637
 #: addressbook/gui/widgets/e-addressbook-view.c:894
 msgid "Email 2"
 msgstr "�᡼��2"
 
-#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/backend/ebook/e-card-simple.c:85
 #: addressbook/gui/component/e-address-popup.c:486
 #: addressbook/gui/contact-editor/e-contact-editor.c:1638
 #: addressbook/gui/widgets/e-addressbook-view.c:895
 msgid "Email 3"
 msgstr "�᡼��3"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/widgets/e-addressbook-view.c:896
 msgid "Web Site"
 msgstr "�����֥�����"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:86
 msgid "Url"
 msgstr "URL"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/widgets/e-addressbook-view.c:897
 msgid "Department"
 msgstr "����"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:87
 msgid "Dep"
 msgstr "����"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/backend/ebook/e-card-simple.c:88
 #: addressbook/gui/widgets/e-addressbook-view.c:898
 msgid "Office"
 msgstr "��̳��"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/backend/ebook/e-card-simple.c:88
 msgid "Off"
 msgstr "��̳��"
 
-#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card-simple.c:89
 #: addressbook/gui/widgets/e-addressbook-view.c:899
 msgid "Title"
 msgstr "�ɾ�(���Ĥ�)"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:90
 #: addressbook/gui/widgets/e-addressbook-view.c:900
 msgid "Profession"
 msgstr "���翦"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Prof"
 msgstr "��"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:91
 #: addressbook/gui/widgets/e-addressbook-view.c:901
 msgid "Manager"
 msgstr "�ޥ͡�����"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:91
 msgid "Man"
 msgstr "�ޥ͡�����"
 
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:92
 msgid "Ass"
 msgstr "�������"
 
-#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card-simple.c:93
 #: addressbook/gui/widgets/e-addressbook-view.c:903
 msgid "Nickname"
 msgstr "�˥å��͡���"
 
-#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card-simple.c:93
 msgid "Nick"
 msgstr "�˥å��͡���"
 
-#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/backend/ebook/e-card-simple.c:94
 #: addressbook/gui/widgets/e-addressbook-view.c:904
 msgid "Spouse"
 msgstr "�۶���"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card-simple.c:95
 #: addressbook/gui/widgets/e-addressbook-view.c:905
 msgid "Note"
 msgstr "����"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:96
 msgid "Calendar URI"
 msgstr "������ URI"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:96
 msgid "CALUri"
 msgstr "������URI"
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:97
 #: addressbook/gui/widgets/e-addressbook-view.c:906
 msgid "Free-busy URL"
 msgstr "����/¿˻ URL"
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:97
 msgid "FBUrl"
 msgstr "����/¿˻ URL"
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "Anniversary"
 msgstr "��ǰ��"
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "Anniv"
 msgstr "��ǰ��"
 
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card-simple.c:99
 msgid "Birth Date"
 msgstr "������"
 
-#: addressbook/backend/ebook/e-card-simple.c:103
+#: addressbook/backend/ebook/e-card-simple.c:102
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "���ƥ���"
 
+#: addressbook/backend/ebook/e-card-simple.c:103
+msgid "Family Name"
+msgstr "��"
+
 #: addressbook/backend/ebook/e-card.c:3564
 msgid "Card: "
 msgstr "̾��: "
@@ -335,7 +335,9 @@ msgstr ""
 msgid ""
 "\n"
 "  Additional: "
-msgstr "\n  ź��: "
+msgstr ""
+"\n"
+"  ź��: "
 
 #: addressbook/backend/ebook/e-card.c:3570
 msgid ""
@@ -405,7 +407,9 @@ msgstr ""
 msgid ""
 "\n"
 "  Region:      "
-msgstr "\n  �ϰ�:      "
+msgstr ""
+"\n"
+"  �ϰ�:      "
 
 #: addressbook/backend/ebook/e-card.c:3603
 msgid ""
@@ -598,10 +602,10 @@ msgstr "%s �� VCard"
 #: 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:1119
+#: addressbook/conduit/address-conduit.c:1167
 #: addressbook/gui/component/addressbook-factory.c:48
-#: calendar/conduits/calendar/calendar-conduit.c:1204
-#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/conduits/calendar/calendar-conduit.c:1262
+#: calendar/conduits/todo/todo-conduit.c:1034
 #: calendar/gui/alarm-notify/notify-main.c:78 calendar/gui/main.c:63
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo �ν����������ޤ���Ǥ���"
@@ -660,20 +664,20 @@ msgstr "����������ɤ߹��ޤ�뤳�Ȥ�����ޤ���Ǥ���\n"
 msgid "EBook not loaded\n"
 msgstr "EBook �ϥ����ɤ���Ƥ��ޤ���\n"
 
-#: addressbook/conduit/address-conduit.c:681
-#: calendar/conduits/calendar/calendar-conduit.c:778
-#: calendar/conduits/todo/todo-conduit.c:592
+#: addressbook/conduit/address-conduit.c:731
+#: calendar/conduits/calendar/calendar-conduit.c:837
+#: calendar/conduits/todo/todo-conduit.c:609
 msgid "Could not start wombat server"
 msgstr "wombat �����Ф򳫻Ϥ��뤳�Ȥ�����ޤ���Ǥ���"
 
-#: addressbook/conduit/address-conduit.c:682
-#: calendar/conduits/calendar/calendar-conduit.c:779
-#: calendar/conduits/todo/todo-conduit.c:593
+#: addressbook/conduit/address-conduit.c:732
+#: calendar/conduits/calendar/calendar-conduit.c:838
+#: calendar/conduits/todo/todo-conduit.c:610
 msgid "Could not start wombat"
 msgstr "wombat �򳫻Ϥ��뤳�Ȥ�����ޤ���Ǥ���"
 
-#: addressbook/conduit/address-conduit.c:714
-#: addressbook/conduit/address-conduit.c:717
+#: addressbook/conduit/address-conduit.c:762
+#: addressbook/conduit/address-conduit.c:765
 msgid "Could not read pilot's Address application block"
 msgstr ""
 "�ѥ����åȤΥ��ɥ쥹���ץꥱ�������֥��å����ɤ߹��ळ�Ȥ�����ޤ���Ǥ���"
@@ -719,8 +723,8 @@ msgid "Factory for the sample Addressbook control"
 msgstr "����ץ륢�ɥ쥹Ģ����ȥ�����Τ���Υե����ȥ�"
 
 #: addressbook/gui/component/addressbook-component.c:66
-#: calendar/gui/dialogs/comp-editor-util.c:281
-#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:173
+#: calendar/gui/dialogs/comp-editor-util.c:289
+#: calendar/gui/dialogs/comp-editor-util.c:345 shell/e-local-storage.c:173
 #: shell/e-shortcuts.c:1062
 msgid "Contacts"
 msgstr "Ϣ����"
@@ -737,20 +741,20 @@ msgstr "LDAP ������"
 msgid "LDAP server containing contact information"
 msgstr "Ϣ�������Τ���LDAP������"
 
-#: addressbook/gui/component/addressbook-component.c:386
+#: addressbook/gui/component/addressbook-component.c:411
 #: ui/evolution-addressbook.xml.h:11
 msgid "New Contact"
 msgstr "����Ϣ����"
 
-#: addressbook/gui/component/addressbook-component.c:386
+#: addressbook/gui/component/addressbook-component.c:411
 msgid "New _Contact"
 msgstr "����Ϣ����"
 
-#: addressbook/gui/component/addressbook-component.c:387
+#: addressbook/gui/component/addressbook-component.c:412
 msgid "New Contact List"
 msgstr "����Ϣ����ꥹ��"
 
-#: addressbook/gui/component/addressbook-component.c:387
+#: addressbook/gui/component/addressbook-component.c:412
 msgid "New Contact _List"
 msgstr "����Ϣ����ꥹ��(_L)"
 
@@ -854,19 +858,19 @@ msgid "_Account name:"
 msgstr "���������̾(_A):"
 
 #: addressbook/gui/component/addressbook-config.glade.h:22
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: 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:90 my-evolution/my-evolution.glade.h:20
+#: mail/mail-config.glade.h:91 my-evolution/my-evolution.glade.h:20
 msgid "_Add"
 msgstr "�ɲ�(_A)"
 
 #: addressbook/gui/component/addressbook-config.glade.h:23
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:95
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:96
 #: ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
 #: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
 msgstr "�Խ�(_E)"
@@ -887,28 +891,28 @@ msgstr "������̾(_S):"
 msgid "Other Contacts"
 msgstr "¾��Ϣ����"
 
-#: addressbook/gui/component/addressbook.c:393
+#: addressbook/gui/component/addressbook.c:407
 #, c-format
 msgid "Please enter your email address and password for access to %s"
 msgstr "%s�˥����������뤿����Żҥ᡼�륢�ɥ쥹�ȥѥ���ɤ����Ϥ��Ƥ�������"
 
-#: addressbook/gui/component/addressbook.c:401
+#: addressbook/gui/component/addressbook.c:415
 msgid "LDAP Authentication"
 msgstr "LDAPǧ��"
 
-#: addressbook/gui/component/addressbook.c:412
+#: addressbook/gui/component/addressbook.c:426
 msgid "Email Address:"
 msgstr "�Żҥ᡼�륢�ɥ쥹:"
 
-#: addressbook/gui/component/addressbook.c:425
+#: addressbook/gui/component/addressbook.c:439
 msgid "Password:"
 msgstr "�ѥ����:"
 
-#: addressbook/gui/component/addressbook.c:488
+#: addressbook/gui/component/addressbook.c:502
 msgid "Unable to open addressbook"
 msgstr "���ɥ쥹Ģ�򳫤����Ȥ�����ޤ���"
 
-#: addressbook/gui/component/addressbook.c:495
+#: addressbook/gui/component/addressbook.c:509
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -918,7 +922,7 @@ msgstr ""
 "�����Ϥ�����, ���뤤�� LDAP �����Ф�����Ƥ��뤫�Τɤ��餫\n"
 "���̣���ޤ�"
 
-#: addressbook/gui/component/addressbook.c:500
+#: addressbook/gui/component/addressbook.c:514
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -930,7 +934,7 @@ msgstr ""
 "���� OpenLDAP ����������� CVS ����������ץ�������\n"
 "����ѥ��뤷�ʤ���Фʤ�ޤ���\n"
 
-#: addressbook/gui/component/addressbook.c:508
+#: addressbook/gui/component/addressbook.c:522
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -938,37 +942,37 @@ msgstr ""
 "���Υ��ɥ쥹Ģ�򳫤����Ȥ�����ޤ���Ǥ���. �ѥ���¸�ߤ�, ����������\n"
 "����äƤ��뤫�ɤ��������å����Ƥ�������"
 
-#: addressbook/gui/component/addressbook.c:649
+#: addressbook/gui/component/addressbook.c:663
 #: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "�ե�����ɤ����Τ�Τ�ޤ�"
 
-#: addressbook/gui/component/addressbook.c:650
+#: addressbook/gui/component/addressbook.c:664
 msgid "Name contains"
 msgstr "̾�������Τ�Τ�ޤ�"
 
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:665
 msgid "Email contains"
 msgstr "�Żҥ᡼�뤬���Τ�Τ�ޤ�"
 
-#: addressbook/gui/component/addressbook.c:652
+#: addressbook/gui/component/addressbook.c:666
 #: calendar/gui/cal-search-bar.c:59
 msgid "Category is"
 msgstr "���ƥ����"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:653 widgets/misc/e-filter-bar.h:97
+#: addressbook/gui/component/addressbook.c:667 widgets/misc/e-filter-bar.h:97
 #: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "�ܺ�..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:883
+#: addressbook/gui/component/addressbook.c:897
 #: calendar/gui/cal-search-bar.c:412
 msgid "Any Category"
 msgstr "���٤ƤΥ��ƥ���"
 
-#: addressbook/gui/component/addressbook.c:925
+#: addressbook/gui/component/addressbook.c:939
 msgid "The URI that the Folder Browser will display"
 msgstr "�ե�����֥饦����ɽ������ URI"
 
@@ -982,7 +986,7 @@ msgid "(none)"
 msgstr "(�ʤ�)"
 
 #: addressbook/gui/component/e-address-popup.c:466
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #: addressbook/gui/contact-editor/e-contact-editor.c:1636
 msgid "Primary Email"
 msgstr "���פʥ᡼��"
@@ -1148,117 +1152,126 @@ msgid "Details"
 msgstr "�ܺ�"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#, fuzzy
+msgid "F_ree/Busy URL:"
+msgstr "����/¿˻ URL"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "File A_s:"
 msgstr "��̾(_S):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "General"
 msgstr "����"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+msgid ""
+"If this person publishes free/busy or other calendar information on the "
+"Internet, enter the address\n"
+"of that information here."
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "New phone type"
 msgstr "�������ü���"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "No_tes:"
 msgstr "����(_T):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Organi_zation:"
 msgstr "���(_Z):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "Phone Types"
 msgstr "���ü���"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "Wants to receive _HTML mail"
 msgstr "HTML �᡼����������(_H)"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Address..."
 msgstr "����(_A)..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "_Assistant's name:"
 msgstr "����������Ȥ�̾��(_A):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Birthday:"
 msgstr "������(_B):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Business"
 msgstr "�Ż�(_B)"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-msgid "_Calendar Information:"
-msgstr "����������(_C):"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 #: calendar/gui/dialogs/event-page.glade.h:12
 #: calendar/gui/dialogs/task-page.glade.h:10
 msgid "_Contacts..."
 msgstr "Ϣ����(_C)..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:834 filter/filter.glade.h:8
-#: mail/folder-browser.c:1371 mail/mail-config.glade.h:94
+#: mail/folder-browser.c:1406 mail/mail-config.glade.h:95
 #: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "���(_D)"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Department:"
 msgstr "����(_D):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-msgid "_Free/Busy Information:"
-msgstr "����/¿˻ ����(_F):"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Full Name..."
 msgstr "�ե�͡���(_F)..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Home"
 msgstr "��(_H)"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Job title:"
 msgstr "����(_J):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Manager's Name:"
 msgstr "�ޥ͡������̾��(_M):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Mobile"
 msgstr "�����(_M)"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Nickname:"
 msgstr "�˥å��͡���(_N):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Office:"
 msgstr "��̳��(_O):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Profession:"
 msgstr "���翦(_P):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#, fuzzy
+msgid "_Public Calendar URL:"
+msgstr "������ URI"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Spouse:"
 msgstr "�۶���(_S):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_This is the mailing address"
 msgstr "�����͹��ʪ�ν���Ǥ�"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Web page address:"
 msgstr "�����֥ڡ�����URL(_W):"
 
@@ -2444,7 +2457,7 @@ msgstr "%d ������"
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
 #: addressbook/gui/widgets/e-addressbook-view.c:691
 #: addressbook/gui/widgets/e-addressbook-view.c:753
-#: addressbook/gui/widgets/e-addressbook-view.c:1373
+#: addressbook/gui/widgets/e-addressbook-view.c:1422
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "VCard ����¸"
@@ -2498,8 +2511,8 @@ msgid "Success"
 msgstr "����"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1710
-#: shell/e-storage.c:515
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1702
+#: shell/e-storage.c:520
 msgid "Unknown error"
 msgstr "�����ʥ��顼"
 
@@ -2507,7 +2520,7 @@ msgstr "�����ʥ��顼"
 msgid "Repository offline"
 msgstr "��ݥ��ȥꥪ�ե饤��"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:505
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:510
 msgid "Permission denied"
 msgstr "���Ĥ�����ޤ���"
 
@@ -2524,10 +2537,10 @@ msgid "Protocol not supported"
 msgstr "�ץ��ȥ���ϥ��ݡ��Ȥ���Ƥ��ޤ���"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:733 calendar/gui/calendar-model.c:1274
+#: calendar/gui/calendar-model.c:726 calendar/gui/calendar-model.c:1247
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:544
-#: camel/camel-service.c:580
+#: calendar/gui/e-calendar-table.c:461 camel/camel-service.c:598
+#: camel/camel-service.c:634
 msgid "Cancelled"
 msgstr "����󥻥뤷�ޤ���"
 
@@ -2552,7 +2565,7 @@ msgid "Error removing list"
 msgstr "�ꥹ�Ȥκ����˥��顼��ȯ�����ޤ���"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1248
+#: addressbook/gui/widgets/e-addressbook-view.c:1297
 msgid "Error removing card"
 msgstr "�����ɤκ����˥��顼��ȯ�����ޤ���"
 
@@ -2825,8 +2838,8 @@ msgstr "�ե����(_F)..."
 msgid "Print cards"
 msgstr "�����ɤΰ���"
 
-#: addressbook/printing/e-contact-print.c:1112
-#: addressbook/printing/e-contact-print.c:1134
+#: addressbook/printing/e-contact-print.c:1152
+#: addressbook/printing/e-contact-print.c:1174
 msgid "Print card"
 msgstr "�����ɤΰ���"
 
@@ -2835,19 +2848,45 @@ msgstr "�����ɤΰ���"
 msgid "Print envelope"
 msgstr "���������"
 
-#: calendar/conduits/calendar/calendar-conduit.c:735
-#: calendar/conduits/todo/todo-conduit.c:548
+#: calendar/cal-util/cal-util.c:418 calendar/cal-util/cal-util.c:440
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:385 mail/message-list.c:652
+msgid "High"
+msgstr "�⤤"
+
+#: calendar/cal-util/cal-util.c:420 calendar/cal-util/cal-util.c:442
+#: calendar/gui/calendar-model.c:1673
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:386 mail/message-list.c:651
+msgid "Normal"
+msgstr "����"
+
+#: calendar/cal-util/cal-util.c:422 calendar/cal-util/cal-util.c:444
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:387 mail/message-list.c:650
+msgid "Low"
+msgstr "�㤤"
+
+#. An empty string is the same as 'None'.
+#: calendar/cal-util/cal-util.c:438
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:388
+msgid "Undefined"
+msgstr "̤���"
+
+#: calendar/conduits/calendar/calendar-conduit.c:793
+#: calendar/conduits/todo/todo-conduit.c:564
 msgid "Error while communicating with calendar server"
 msgstr "�����������Ф��̿���˥��顼��ȯ�����ޤ���"
 
-#: calendar/conduits/calendar/calendar-conduit.c:839
-#: calendar/conduits/calendar/calendar-conduit.c:842
+#: calendar/conduits/calendar/calendar-conduit.c:896
+#: calendar/conduits/calendar/calendar-conduit.c:899
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 "�ѥ����åȤΥ��������ץꥱ�������֥��å����ɤ߹��ळ�Ȥ�����ޤ���Ǥ���"
 
-#: calendar/conduits/todo/todo-conduit.c:653
-#: calendar/conduits/todo/todo-conduit.c:656
+#: calendar/conduits/todo/todo-conduit.c:668
+#: calendar/conduits/todo/todo-conduit.c:671
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 "�ѥ����åȤ� ToDo ���ץꥱ�������֥��å����ɤ߹��ळ�Ȥ�����ޤ���Ǥ���"
@@ -2896,45 +2935,45 @@ msgstr "���顼�����Υ����ӥ�"
 msgid "Factory for the alarm notification service"
 msgstr "���顼�����Υ����ӥ��Τ���Υե����ȥ�"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:152
 #, c-format
 msgid "Notification about your appointment starting on %s and ending on %s"
 msgstr "%s ����Ϥޤꡢ%s �˽���륢�ݥ���ȤˤĤ��Ƥ�����"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:156
 #, c-format
 msgid "Notification about your appointment starting on %s"
 msgstr "%s ����Ϥޤ륢�ݥ���ȤˤĤ��Ƥ�����"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:161
 #, c-format
 msgid "Notification about your appointment ending on %s"
 msgstr "%s �˽���륢�ݥ���ȤˤĤ��Ƥ�����"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:165
 msgid "Notification about your appointment"
 msgstr "���ݥ���ȤˤĤ��Ƥ�����"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:172
 #, c-format
 msgid "Notification about your task starting on %s and ending on %s"
 msgstr "%s �˻Ϥޤꡢ%s �˽���륿�����ˤĤ��Ƥ�����"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:176
 #, c-format
 msgid "Notification about your task starting on %s"
 msgstr "%s �˻Ϥޤ륿�����ˤĤ��Ƥ�����"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:181
 #, c-format
 msgid "Notification about your task ending on %s"
 msgstr "%s �˽���륿�����ˤĤ��Ƥ�����"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:185
 msgid "Notification about your task"
 msgstr "�������ˤĤ��Ƥ�����"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:267
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "%Y/%b/%d %A %H:%M �˥��顼��"
 
@@ -3015,7 +3054,7 @@ msgstr "%Yǯ%m��%d��"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: calendar/gui/calendar-commands.c:467
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1442
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1446
 msgid "%d %B"
 msgstr "%m��%d��"
 
@@ -3025,17 +3064,17 @@ msgid ""
 msgstr ""
 "�������ӥ塼���������ޤ���Ǥ���. ORBit��OAF�����������å����Ƥ�������"
 
-#: calendar/gui/calendar-model.c:399 calendar/gui/calendar-model.c:1001
-#: calendar/gui/e-calendar-table.c:307
+#: calendar/gui/calendar-model.c:399 calendar/gui/calendar-model.c:994
+#: calendar/gui/e-calendar-table.c:364
 msgid "Private"
 msgstr "��Ū"
 
-#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:1003
-#: calendar/gui/e-calendar-table.c:308
+#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:996
+#: calendar/gui/e-calendar-table.c:365
 msgid "Confidential"
 msgstr "��̩"
 
-#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:306
+#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:363
 msgid "Public"
 msgstr "����"
 
@@ -3055,67 +3094,48 @@ msgstr "��"
 msgid "W"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:538 calendar/gui/calendar-model.c:1183
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:652
-msgid "High"
-msgstr "�⤤"
-
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1185
-#: calendar/gui/calendar-model.c:1700
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:651
-msgid "Normal"
-msgstr "����"
-
-#: calendar/gui/calendar-model.c:542 calendar/gui/calendar-model.c:1187
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:650
-msgid "Low"
-msgstr "�㤤"
-
-#: calendar/gui/calendar-model.c:573 calendar/gui/calendar-model.c:1220
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/calendar-model.c:566 calendar/gui/calendar-model.c:1193
+#: calendar/gui/e-calendar-table.c:437
 msgid "Free"
 msgstr "����"
 
-#: calendar/gui/calendar-model.c:575 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/calendar-model.c:568 calendar/gui/e-calendar-table.c:438
 #: calendar/gui/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr "�ӥ���"
 
-#: calendar/gui/calendar-model.c:724 calendar/gui/calendar-model.c:1268
+#: calendar/gui/calendar-model.c:717 calendar/gui/calendar-model.c:1241
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:401
+#: calendar/gui/e-calendar-table.c:458
 msgid "Not Started"
 msgstr "���Ϥ��Ƥ��ʤ�"
 
-#: calendar/gui/calendar-model.c:727 calendar/gui/calendar-model.c:1270
+#: calendar/gui/calendar-model.c:720 calendar/gui/calendar-model.c:1243
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:402
+#: calendar/gui/e-calendar-table.c:459
 msgid "In Progress"
 msgstr "������"
 
-#: calendar/gui/calendar-model.c:730 calendar/gui/calendar-model.c:1272
+#: calendar/gui/calendar-model.c:723 calendar/gui/calendar-model.c:1245
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-meeting-model.c:298
+#: calendar/gui/e-calendar-table.c:460 calendar/gui/e-meeting-model.c:298
 #: calendar/gui/e-meeting-model.c:321
 msgid "Completed"
 msgstr "��λ���ޤ���"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:915 e-util/e-time-utils.c:163
+#: calendar/gui/calendar-model.c:908 e-util/e-time-utils.c:163
 #: e-util/e-time-utils.c:354
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%Y/%m/%d (%a) %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:918 e-util/e-time-utils.c:158
+#: calendar/gui/calendar-model.c:911 e-util/e-time-utils.c:158
 #: e-util/e-time-utils.c:363
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
 
-#: calendar/gui/calendar-model.c:923
+#: calendar/gui/calendar-model.c:916
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -3126,7 +3146,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:1087
+#: calendar/gui/calendar-model.c:1080
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3136,48 +3156,36 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1127
+#: calendar/gui/calendar-model.c:1120
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "�ѡ�������ͤ� 0 �� 100 �δ֤Ǵޤ�Ǥ��ʤ���Фʤ�ޤ���"
 
-#: calendar/gui/calendar-model.c:1168
-msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
-msgstr ""
-"ͥ���٤� '�⤤', '����', '�㤤' ���뤤�� '̤���' �����򤷤ʤ���Фʤ�ޤ���"
-
-#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1181
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:331
-msgid "Undefined"
-msgstr "̤���"
-
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1266 calendar/gui/dialogs/meeting-page.c:332
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1444
+#: calendar/gui/calendar-model.c:1239 calendar/gui/dialogs/meeting-page.c:332
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1446
 #: mail/mail-accounts.c:143 mail/mail-accounts.c:390
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:50
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:203
-#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
-#: widgets/misc/e-dateedit.c:1428 widgets/misc/e-dateedit.c:1543
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:453
+#: widgets/misc/e-dateedit.c:1453 widgets/misc/e-dateedit.c:1568
 msgid "None"
 msgstr "����"
 
-#: calendar/gui/calendar-model.c:1702
+#: calendar/gui/calendar-model.c:1675
 msgid "Recurring"
 msgstr "�����֤�"
 
-#: calendar/gui/calendar-model.c:1704
+#: calendar/gui/calendar-model.c:1677
 msgid "Assigned"
 msgstr "�����ƺѤ�"
 
-#: calendar/gui/calendar-model.c:1710 calendar/gui/e-meeting-model.c:270
+#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:270
 #: calendar/gui/e-meeting-model.c:280 calendar/gui/e-meeting-model.c:506
 #: calendar/gui/e-meeting-model.c:702
 msgid "Yes"
 msgstr "�Ϥ�"
 
-#: calendar/gui/calendar-model.c:1710 calendar/gui/e-meeting-model.c:282
+#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:282
 #: calendar/gui/e-meeting-model.c:703
 msgid "No"
 msgstr "������"
@@ -3214,40 +3222,40 @@ msgstr "�����Ȥ����Τ�Τ�ޤ�"
 msgid "Unmatched"
 msgstr "�԰���"
 
-#: calendar/gui/component-factory.c:62 my-evolution/my-evolution.glade.h:6
+#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:6
 #: shell/e-local-storage.c:172 shell/e-shortcuts.c:1056
 msgid "Calendar"
 msgstr "������"
 
-#: calendar/gui/component-factory.c:63
+#: calendar/gui/component-factory.c:64
 msgid "Folder containing appointments and events"
 msgstr "�ե�����ϥ��ݥ���Ȥȥ��٥�Ȥ�ޤ�Ǥޤ�"
 
-#: calendar/gui/component-factory.c:67 calendar/gui/print.c:1719
-#: my-evolution/e-summary-tasks.c:215 my-evolution/e-summary-tasks.c:231
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1723
+#: my-evolution/e-summary-tasks.c:237 my-evolution/e-summary-tasks.c:253
 #: shell/e-local-storage.c:178 shell/e-shortcuts.c:1059
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "������"
 
-#: calendar/gui/component-factory.c:68
+#: calendar/gui/component-factory.c:69
 msgid "Folder containing to-do items"
 msgstr "�ե������ ToDo ���ܤ�ޤ�"
 
-#: calendar/gui/component-factory.c:593 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:581 ui/evolution-calendar.xml.h:7
 msgid "Create a new appointment"
 msgstr "�������ݥ���Ȥ�������ޤ�"
 
-#: calendar/gui/component-factory.c:594 calendar/gui/e-day-view.c:3420
+#: calendar/gui/component-factory.c:582 calendar/gui/e-day-view.c:3422
 msgid "New _Appointment"
 msgstr "�������ݥ����(_A)"
 
-#: calendar/gui/component-factory.c:599 ui/evolution-calendar.xml.h:8
+#: calendar/gui/component-factory.c:587 ui/evolution-calendar.xml.h:8
 #: ui/evolution-tasks.xml.h:5
 msgid "Create a new task"
 msgstr "������������������ޤ�"
 
-#: calendar/gui/component-factory.c:600
+#: calendar/gui/component-factory.c:588
 msgid "New _Task"
 msgstr "����������(_T)"
 
@@ -3321,95 +3329,120 @@ msgstr "��"
 msgid "minutes"
 msgstr "ʬ"
 
-#: calendar/gui/dialogs/alarm-page.c:303
+#: calendar/gui/dialogs/alarm-page.c:307
 #, c-format
 msgid "%d days"
 msgstr "%d ��"
 
-#: calendar/gui/dialogs/alarm-page.c:305
+#: calendar/gui/dialogs/alarm-page.c:310
 msgid "1 day"
 msgstr "1 ��"
 
-#: calendar/gui/dialogs/alarm-page.c:308
+#: calendar/gui/dialogs/alarm-page.c:315
 #, c-format
 msgid "%d weeks"
 msgstr "%d ����"
 
-#: calendar/gui/dialogs/alarm-page.c:310
+#: calendar/gui/dialogs/alarm-page.c:318
 msgid "1 week"
 msgstr "1 ����"
 
-#: calendar/gui/dialogs/alarm-page.c:313
+#: calendar/gui/dialogs/alarm-page.c:323
 #, c-format
 msgid "%d hours"
 msgstr "%d ����"
 
-#: calendar/gui/dialogs/alarm-page.c:315
+#: calendar/gui/dialogs/alarm-page.c:326
 msgid "1 hour"
 msgstr "1 ����"
 
-#: calendar/gui/dialogs/alarm-page.c:318
+#: calendar/gui/dialogs/alarm-page.c:331
 #, c-format
 msgid "%d minutes"
 msgstr "%d ʬ"
 
-#: calendar/gui/dialogs/alarm-page.c:320
+#: calendar/gui/dialogs/alarm-page.c:334
 msgid "1 minute"
 msgstr "1 ʬ"
 
-#: calendar/gui/dialogs/alarm-page.c:323
+#: calendar/gui/dialogs/alarm-page.c:339
 #, c-format
 msgid "%d seconds"
 msgstr "%d ��"
 
-#: calendar/gui/dialogs/alarm-page.c:325
+#: calendar/gui/dialogs/alarm-page.c:342
 msgid "1 second"
 msgstr "1 ��"
 
-#: calendar/gui/dialogs/alarm-page.c:350
+#: calendar/gui/dialogs/alarm-page.c:373
 #: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "���λ��˲��ڤ��������:"
 
-#: calendar/gui/dialogs/alarm-page.c:354
+#: calendar/gui/dialogs/alarm-page.c:377
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 msgid "Display a message"
 msgstr "��å�������ɽ��"
 
-#: calendar/gui/dialogs/alarm-page.c:358
+#: calendar/gui/dialogs/alarm-page.c:381
 msgid "Send an email"
 msgstr "���λ��˥᡼�����������:"
 
-#: calendar/gui/dialogs/alarm-page.c:362
+#: calendar/gui/dialogs/alarm-page.c:385
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "���λ��˥ץ�������¹Ԥ���:"
 
-#: calendar/gui/dialogs/alarm-page.c:368 calendar/gui/dialogs/alarm-page.c:404
-#: calendar/gui/e-meeting-model.c:226 calendar/gui/e-meeting-model.c:261
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:674
-#: calendar/gui/e-meeting-model.c:690
-#: camel/providers/smtp/camel-smtp-transport.c:224
-#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
-msgid "Unknown"
-msgstr "̤��"
+#: calendar/gui/dialogs/alarm-page.c:391
+#, fuzzy
+msgid "Unknown action to be performed"
+msgstr "̤�Τ�����"
+
+#: calendar/gui/dialogs/alarm-page.c:403
+#, fuzzy, c-format
+msgid "%s %s before the start of the appointment"
+msgstr "���ݥ���Ȥγ�����"
+
+#: calendar/gui/dialogs/alarm-page.c:406
+#, fuzzy, c-format
+msgid "%s %s after the start of the appointment"
+msgstr "���ݥ���Ȥγ�����"
 
-#: calendar/gui/dialogs/alarm-page.c:380
-msgid "before start of appointment"
+#: calendar/gui/dialogs/alarm-page.c:411
+#, fuzzy, c-format
+msgid "%s at the start of the appointment"
 msgstr "���ݥ���Ȥγ�����"
 
-#: calendar/gui/dialogs/alarm-page.c:383
-msgid "after start of appointment"
-msgstr "���ݥ���Ȥγ��ϸ�"
+#: calendar/gui/dialogs/alarm-page.c:420
+#, fuzzy, c-format
+msgid "%s %s before the end of the appointment"
+msgstr "���ݥ���Ȥγ�����"
 
-#: calendar/gui/dialogs/alarm-page.c:393
-msgid "before end of appointment"
-msgstr "���ݥ���Ȥν�λ��"
+#: calendar/gui/dialogs/alarm-page.c:423
+#, fuzzy, c-format
+msgid "%s %s after the end of the appointment"
+msgstr "���ݥ���Ȥν�λ��"
 
-#: calendar/gui/dialogs/alarm-page.c:396
-msgid "after end of appointment"
+#: calendar/gui/dialogs/alarm-page.c:428
+#, fuzzy, c-format
+msgid "%s at the end of the appointment"
 msgstr "���ݥ���Ȥν�λ��"
 
+#: calendar/gui/dialogs/alarm-page.c:439
+#, fuzzy, c-format
+msgid "%s at an unknown time"
+msgstr "������������"
+
+#: calendar/gui/dialogs/alarm-page.c:445
+#, fuzzy, c-format
+msgid "%s at %s"
+msgstr "%s ������ %s"
+
+#: calendar/gui/dialogs/alarm-page.c:452
+#, c-format
+msgid "%s for an unknown trigger type"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3724,55 +3757,55 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:159 calendar/gui/print.c:2128
+#: calendar/gui/dialogs/comp-editor-util.c:167 calendar/gui/print.c:2132
 msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:163 calendar/gui/print.c:2132
+#: calendar/gui/dialogs/comp-editor-util.c:171 calendar/gui/print.c:2136
 msgid " (Completed "
 msgstr " (��� "
 
-#: calendar/gui/dialogs/comp-editor-util.c:165 calendar/gui/print.c:2134
+#: calendar/gui/dialogs/comp-editor-util.c:173 calendar/gui/print.c:2138
 msgid "Completed "
 msgstr "��� "
 
-#: calendar/gui/dialogs/comp-editor-util.c:170 calendar/gui/print.c:2139
+#: calendar/gui/dialogs/comp-editor-util.c:178 calendar/gui/print.c:2143
 msgid " (Due "
 msgstr " (���� "
 
-#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2141
+#: calendar/gui/dialogs/comp-editor-util.c:180 calendar/gui/print.c:2145
 msgid "Due "
 msgstr "���� "
 
-#: calendar/gui/dialogs/comp-editor.c:515
+#: calendar/gui/dialogs/comp-editor.c:521
 msgid "Edit Appointment"
 msgstr "���ݥ���Ȥ��Խ�"
 
-#: calendar/gui/dialogs/comp-editor.c:520
+#: calendar/gui/dialogs/comp-editor.c:526
 #, c-format
 msgid "Appointment - %s"
 msgstr "���ݥ���� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:523
+#: calendar/gui/dialogs/comp-editor.c:529
 #, c-format
 msgid "Task - %s"
 msgstr "������ - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:526
+#: calendar/gui/dialogs/comp-editor.c:532
 #, c-format
 msgid "Journal entry - %s"
 msgstr "�������� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:540
+#: calendar/gui/dialogs/comp-editor.c:546
 msgid "No summary"
 msgstr "���ޥ�Ϥ���ޤ���"
 
-#: calendar/gui/dialogs/comp-editor.c:950 mail/mail-callbacks.c:1662
+#: calendar/gui/dialogs/comp-editor.c:952 mail/mail-callbacks.c:1671
 #: mail/mail-display.c:100
 msgid "Overwrite file?"
 msgstr "�ե�������񤭤��ޤ���?"
 
-#: calendar/gui/dialogs/comp-editor.c:954 mail/mail-callbacks.c:1668
+#: calendar/gui/dialogs/comp-editor.c:956 mail/mail-callbacks.c:1677
 #: mail/mail-display.c:104
 msgid ""
 "A file by that name already exists.\n"
@@ -3781,53 +3814,53 @@ msgstr ""
 "����̾���Υե�����Ϥ��Ǥ�¸�ߤ��ޤ�\n"
 "��񤭤��ޤ���?"
 
-#: calendar/gui/dialogs/comp-editor.c:1017 ui/evolution-comp-editor.xml.h:13
+#: calendar/gui/dialogs/comp-editor.c:1019 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "��̾����¸..."
 
-#: calendar/gui/dialogs/comp-editor.c:1170
+#: calendar/gui/dialogs/comp-editor.c:1172
 msgid "Unable to obtain current version!"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:90
+#: calendar/gui/dialogs/delete-comp.c:91
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "�����˥��ݥ���� `%s' �������Ƥ��������Ǥ���?"
 
-#: calendar/gui/dialogs/delete-comp.c:93
+#: calendar/gui/dialogs/delete-comp.c:94
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "�����˥����ȥ�ʤ��Υ��ݥ���Ȥ������Ƥ��������Ǥ���?"
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:100
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "�����˥����� `%s' �������Ƥ��������Ǥ���?"
 
-#: calendar/gui/dialogs/delete-comp.c:102
+#: calendar/gui/dialogs/delete-comp.c:103
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "�����˥����ȥ�ʤ��Υ������������Ƥ��������Ǥ���?"
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:109
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "�����˻������� `%s' �������Ƥ��������Ǥ���?"
 
-#: calendar/gui/dialogs/delete-comp.c:111
+#: calendar/gui/dialogs/delete-comp.c:112
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "�����˥����ȥ�ʤ��λ��������������Ƥ��������Ǥ���?"
 
-#: calendar/gui/dialogs/delete-comp.c:126
+#: calendar/gui/dialogs/delete-comp.c:127
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "������ %d �ĤΥ��ݥ���Ȥ������Ƥ��������Ǥ���?"
 
-#: calendar/gui/dialogs/delete-comp.c:131
+#: calendar/gui/dialogs/delete-comp.c:132
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "������ %d �ĤΥ������������Ƥ��������Ǥ���?"
 
-#: calendar/gui/dialogs/delete-comp.c:136
+#: calendar/gui/dialogs/delete-comp.c:137
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "������ %d �Ĥλ��������������Ƥ��������Ǥ���?"
@@ -4008,7 +4041,7 @@ msgstr "���ơ�����"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:18
-#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:85
+#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:86
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "����"
@@ -4030,8 +4063,8 @@ msgstr "¾�ξ���(_I)..."
 msgid "_Other Organizer"
 msgstr "¾�μ�ż�(_O)"
 
-#: calendar/gui/dialogs/recurrence-page.c:422 calendar/gui/print.c:1851
-#: calendar/gui/print.c:1853 calendar/gui/print.c:1854
+#: calendar/gui/dialogs/recurrence-page.c:422 calendar/gui/print.c:1855
+#: calendar/gui/print.c:1857 calendar/gui/print.c:1858
 msgid "%a %b %d %Y"
 msgstr "%Y/%b/%d (%a)"
 
@@ -4150,7 +4183,7 @@ msgid "Progress"
 msgstr "������"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:910
+#: my-evolution/e-summary-preferences.c:949
 msgid "URL:"
 msgstr "URL:"
 
@@ -4169,7 +4202,7 @@ msgstr "������"
 
 #: calendar/gui/dialogs/task-page.glade.h:4
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:28
 msgid "Description:"
 msgstr "����:"
 
@@ -4185,105 +4218,105 @@ msgstr "��̩(_C)"
 msgid "_Due Date:"
 msgstr "����(_D):"
 
-#: calendar/gui/e-calendar-table.c:350
+#: calendar/gui/e-calendar-table.c:407
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:351
+#: calendar/gui/e-calendar-table.c:408
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:409
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:410
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:411
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:412
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:356
+#: calendar/gui/e-calendar-table.c:413
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:357
+#: calendar/gui/e-calendar-table.c:414
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:358
+#: calendar/gui/e-calendar-table.c:415
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:359
+#: calendar/gui/e-calendar-table.c:416
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:360
+#: calendar/gui/e-calendar-table.c:417
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3441
-#: calendar/gui/e-week-view.c:3288 mail/folder-browser.c:1336
+#: calendar/gui/e-calendar-table.c:914 calendar/gui/e-day-view.c:3443
+#: calendar/gui/e-week-view.c:3296 mail/folder-browser.c:1371
 #: shell/e-shortcuts-view.c:385
 msgid "_Open"
 msgstr "����(_O)"
 
-#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3450
-#: calendar/gui/e-week-view.c:3297 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:918 calendar/gui/e-day-view.c:3452
+#: calendar/gui/e-week-view.c:3305 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:856 calendar/gui/e-day-view.c:3452
-#: calendar/gui/e-week-view.c:3299 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:920 calendar/gui/e-day-view.c:3454
+#: calendar/gui/e-week-view.c:3307 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:14
 msgid "_Copy"
 msgstr "���ԡ�(_C)"
 
-#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3427
-#: calendar/gui/e-day-view.c:3454 calendar/gui/e-week-view.c:3275
-#: calendar/gui/e-week-view.c:3301 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:922 calendar/gui/e-day-view.c:3429
+#: calendar/gui/e-day-view.c:3456 calendar/gui/e-week-view.c:3283
+#: calendar/gui/e-week-view.c:3309 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:40 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:17
 msgid "_Paste"
 msgstr "Ž���դ�(_P)"
 
-#: calendar/gui/e-calendar-table.c:863
+#: calendar/gui/e-calendar-table.c:927
 msgid "_Mark as Complete"
 msgstr "��λ�Ȥ��ƥޡ���(_M)"
 
-#: calendar/gui/e-calendar-table.c:865
+#: calendar/gui/e-calendar-table.c:929
 msgid "_Delete this Task"
 msgstr "������������(_D)"
 
-#: calendar/gui/e-calendar-table.c:868
+#: calendar/gui/e-calendar-table.c:932
 msgid "_Mark Tasks as Complete"
 msgstr "��������λ�Ȥ��ƥޡ���(_M)"
 
-#: calendar/gui/e-calendar-table.c:870
+#: calendar/gui/e-calendar-table.c:934
 msgid "_Delete Selected Tasks"
 msgstr "���򤷤�����������(_D)"
 
-#: calendar/gui/e-calendar-table.c:1130
+#: calendar/gui/e-calendar-table.c:1194
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "���������ɲä���ˤϤ����򥯥�å�"
@@ -4292,8 +4325,8 @@ msgstr "���������ɲä���ˤϤ����򥯥�å�"
 msgid "Alarms"
 msgstr "���顼��"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:702
-#: camel/camel-filter-driver.c:819
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:718
+#: camel/camel-filter-driver.c:834
 msgid "Complete"
 msgstr "��λ���ޤ���"
 
@@ -4324,8 +4357,8 @@ 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:30 shell/e-shortcuts.c:1050
-#: shell/e-storage-set-view.c:1424 shell/e-summary-storage.c:80
+#: my-evolution/component-factory.c:45 shell/e-shortcuts.c:1050
+#: shell/e-storage-set-view.c:1420 shell/e-summary-storage.c:80
 msgid "Summary"
 msgstr "���ޥ�"
 
@@ -4345,7 +4378,7 @@ 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:285 calendar/gui/e-day-view.c:1374
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1458
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
 msgid "%A %d %B"
 msgstr "%B %d %A"
 
@@ -4357,273 +4390,290 @@ 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:608 calendar/gui/e-week-view.c:344
-#: calendar/gui/print.c:765
+#: calendar/gui/e-day-view.c:608 calendar/gui/e-week-view.c:345
+#: calendar/gui/print.c:769
 msgid "am"
 msgstr "����"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:347
-#: calendar/gui/print.c:767
+#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:348
+#: calendar/gui/print.c:771
 msgid "pm"
 msgstr "���"
 
-#: calendar/gui/e-day-view.c:3422 calendar/gui/e-week-view.c:3270
+#: calendar/gui/e-day-view.c:3424 calendar/gui/e-week-view.c:3278
 msgid "New All Day _Event"
 msgstr "�����������٥��"
 
-#: calendar/gui/e-day-view.c:3432 calendar/gui/e-week-view.c:3280
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3288
 #: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "�����ذ�ư(_T)"
 
-#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3282
+#: calendar/gui/e-day-view.c:3436 calendar/gui/e-week-view.c:3290
 msgid "_Go to Date..."
 msgstr "�������ذ�ư(_G)..."
 
-#: calendar/gui/e-day-view.c:3443 calendar/gui/e-week-view.c:3290
+#: calendar/gui/e-day-view.c:3445 calendar/gui/e-week-view.c:3298
 msgid "_Delete this Appointment"
 msgstr "���Υ��ݥ���Ȥ���(_D)"
 
-#: calendar/gui/e-day-view.c:3462 calendar/gui/e-week-view.c:3315
+#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3323
 msgid "Make this Occurrence _Movable"
 msgstr "���ν�������ư�ˤ���(_M)"
 
-#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3317
+#: calendar/gui/e-day-view.c:3466 calendar/gui/e-week-view.c:3325
 msgid "Delete this _Occurrence"
 msgstr "����������(_O)"
 
-#: calendar/gui/e-day-view.c:3466 calendar/gui/e-week-view.c:3319
+#: calendar/gui/e-day-view.c:3468 calendar/gui/e-week-view.c:3327
 msgid "Delete _All Occurrences"
 msgstr "���٤Ƥν��������(_A)"
 
+#: calendar/gui/e-itip-control.c:469
+msgid "Meeting begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:474
+msgid "Task begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:479
+#, fuzzy
+msgid "Free/Busy info begins: <b>"
+msgstr "����/¿˻ ����(_F):"
+
+#: calendar/gui/e-itip-control.c:483
+msgid "Begins: <b>"
+msgstr ""
+
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:677
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:664
+#: calendar/gui/e-itip-control.c:692
 #, c-format
 msgid "<b>Summary:</b> %s<br><br>"
 msgstr "<b>���ޥ�:</b> %s<br><br>"
 
-#: calendar/gui/e-itip-control.c:664
+#: calendar/gui/e-itip-control.c:692
 msgid "<i>None</i>"
 msgstr "<i>�ʤ�</i>"
 
-#: calendar/gui/e-itip-control.c:674
+#: calendar/gui/e-itip-control.c:702
 #, c-format
 msgid "<b>Description:</b> %s"
 msgstr "<b>����:</b> %s"
 
-#: calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:737
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> �ϸ������줿��ľ���Ǥ�"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:738
 msgid "Meeting Information"
 msgstr "��ľ���"
 
-#: calendar/gui/e-itip-control.c:715
+#: calendar/gui/e-itip-control.c:742
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:716
+#: calendar/gui/e-itip-control.c:743
 msgid "Meeting Proposal"
 msgstr "��Ĥ����"
 
-#: calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-itip-control.c:747
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:721
+#: calendar/gui/e-itip-control.c:748
 msgid "Meeting Update"
 msgstr "�����"
 
-#: calendar/gui/e-itip-control.c:725
+#: calendar/gui/e-itip-control.c:752
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:726
+#: calendar/gui/e-itip-control.c:753
 msgid "Meeting Update Request"
 msgstr "��Ĥι����׵�"
 
-#: calendar/gui/e-itip-control.c:730
+#: calendar/gui/e-itip-control.c:757
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> �ϲ�Ĥ��׵���������ޤ���"
 
-#: calendar/gui/e-itip-control.c:731
+#: calendar/gui/e-itip-control.c:758
 msgid "Meeting Reply"
 msgstr "��Ĥ˴ؤ�������"
 
-#: calendar/gui/e-itip-control.c:735
+#: calendar/gui/e-itip-control.c:762
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> �ϲ�Ĥ򥭥�󥻥뤷�ޤ���"
 
-#: calendar/gui/e-itip-control.c:736
+#: calendar/gui/e-itip-control.c:763
 msgid "Meeting Cancellation"
 msgstr "��Ĥ򥭥�󥻥�"
 
-#: calendar/gui/e-itip-control.c:740 calendar/gui/e-itip-control.c:788
-#: calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:767 calendar/gui/e-itip-control.c:815
+#: calendar/gui/e-itip-control.c:848
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:741
+#: calendar/gui/e-itip-control.c:768
 msgid "Bad Meeting Message"
 msgstr "�����ʲ�ĥ�å�����"
 
-#: calendar/gui/e-itip-control.c:758
+#: calendar/gui/e-itip-control.c:785
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:759
+#: calendar/gui/e-itip-control.c:786
 msgid "Task Information"
 msgstr "����������"
 
-#: calendar/gui/e-itip-control.c:763
+#: calendar/gui/e-itip-control.c:790
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:791
 msgid "Task Proposal"
 msgstr "�����������"
 
-#: calendar/gui/e-itip-control.c:768
+#: calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:769
+#: calendar/gui/e-itip-control.c:796
 msgid "Task Update"
 msgstr "�������򹹿�"
 
-#: calendar/gui/e-itip-control.c:773
+#: calendar/gui/e-itip-control.c:800
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:774
+#: calendar/gui/e-itip-control.c:801
 msgid "Task Update Request"
 msgstr "�������ι����׵�"
 
-#: calendar/gui/e-itip-control.c:778
+#: calendar/gui/e-itip-control.c:805
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> �ϥ������γ�����Ƥ��������ޤ���"
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:806
 msgid "Task Reply"
 msgstr "�������˴ؤ�������"
 
-#: calendar/gui/e-itip-control.c:783
+#: calendar/gui/e-itip-control.c:810
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> �ϥ������򥭥�󥻥뤷�ޤ���"
 
-#: calendar/gui/e-itip-control.c:784
+#: calendar/gui/e-itip-control.c:811
 msgid "Task Cancellation"
 msgstr "�������򥭥�󥻥�"
 
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:816
 msgid "Bad Task Message"
 msgstr "�����ʥ�������å�����"
 
-#: calendar/gui/e-itip-control.c:806
+#: calendar/gui/e-itip-control.c:833
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> �϶���/¿˻ �����������ޤ���"
 
-#: calendar/gui/e-itip-control.c:807
+#: calendar/gui/e-itip-control.c:834
 msgid "Free/Busy Information"
 msgstr "����/¿˻ ����"
 
-#: calendar/gui/e-itip-control.c:811
+#: calendar/gui/e-itip-control.c:838
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> �� ���ʤ��ζ���/¿˻ ������׵ᤷ�ޤ���"
 
-#: calendar/gui/e-itip-control.c:812
+#: calendar/gui/e-itip-control.c:839
 msgid "Free/Busy Request"
 msgstr "����/¿˻ ���׵�"
 
-#: calendar/gui/e-itip-control.c:816
+#: calendar/gui/e-itip-control.c:843
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> �� ���ʤ��ζ���/¿˻ ����˴ؤ����������ޤ���"
 
-#: calendar/gui/e-itip-control.c:817
+#: calendar/gui/e-itip-control.c:844
 msgid "Free/Busy Reply"
 msgstr "����/¿˻ ���ֿ�"
 
-#: calendar/gui/e-itip-control.c:822
+#: calendar/gui/e-itip-control.c:849
 msgid "Bad Free/Busy Message"
 msgstr "������ ����/¿˻ ��å�����"
 
-#: calendar/gui/e-itip-control.c:889
+#: calendar/gui/e-itip-control.c:916
 msgid "The message does not appear to be properly formed"
 msgstr "���Υ�å������������������ǤϤ���ޤ���"
 
-#: calendar/gui/e-itip-control.c:908
+#: calendar/gui/e-itip-control.c:935
 msgid "The message contains only unsupported requests."
 msgstr "���Υ�å�������̤�б����׵��ޤ�Ǥ��ޤ�"
 
-#: calendar/gui/e-itip-control.c:936 calendar/gui/e-itip-control.c:942
+#: calendar/gui/e-itip-control.c:963 calendar/gui/e-itip-control.c:969
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1088
 msgid "Calendar file could not be updated!\n"
 msgstr "���������ե�����Ϲ����Ǥ��ޤ���Ǥ���!\n"
 
-#: calendar/gui/e-itip-control.c:1063
+#: calendar/gui/e-itip-control.c:1090
 msgid "Update complete\n"
 msgstr "������λ\n"
 
-#: calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.c:1134
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1142
 msgid "Attendee status ould not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1144
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1119
+#: calendar/gui/e-itip-control.c:1146
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1174
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "��Ϥ��ʤ��Υ������ե����뤫�餽�Υ����ƥ�����Ǥ��ޤ���Ǥ���!\n"
 
-#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-itip-control.c:1176
 msgid "Removal Complete"
 msgstr "�����λ"
 
-#: calendar/gui/e-itip-control.c:1181 calendar/gui/e-itip-control.c:1216
+#: calendar/gui/e-itip-control.c:1208 calendar/gui/e-itip-control.c:1242
 msgid "Item sent!\n"
 msgstr "�����ƥ������!\n"
 
-#: calendar/gui/e-itip-control.c:1183 calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1210 calendar/gui/e-itip-control.c:1246
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1380
+#: calendar/gui/e-itip-control.c:1406
 msgid "Unable to find any of your identities in the attendees list!\n"
 msgstr ""
 
@@ -4684,6 +4734,14 @@ msgstr "�꥽����"
 msgid "Room"
 msgstr "����"
 
+#: calendar/gui/e-meeting-model.c:226 calendar/gui/e-meeting-model.c:261
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:674
+#: calendar/gui/e-meeting-model.c:690
+#: camel/providers/smtp/camel-smtp-transport.c:224
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
+msgid "Unknown"
+msgstr "̤��"
+
 #: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
 #: calendar/gui/e-meeting-model.c:686
 msgid "Chair"
@@ -4736,14 +4794,14 @@ msgstr "������"
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:472
-#: calendar/gui/e-meeting-time-sel.c:1936
+#: calendar/gui/e-meeting-time-sel.c:1937
 msgid "%A, %B %d, %Y"
 msgstr "%Yǯ %m�� %d�� %A"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:476
-#: calendar/gui/e-meeting-time-sel.c:1964 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:1965 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:345
 msgid "%a %m/%d/%Y"
 msgstr "%Y/%m/%d (%a)"
@@ -4751,7 +4809,7 @@ msgstr "%Y/%m/%d (%a)"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:480 e-util/e-time-utils.c:221
-#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1552
+#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1577
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
@@ -4829,16 +4887,16 @@ msgstr "'%s' �Υ��������ɤ߹��ळ�Ȥ�����ޤ���Ǥ���"
 msgid "The method required to load `%s' is not supported"
 msgstr "'%s' ���ɤ߹��ळ�Ȥ��׵ᤵ���᥽�åɤϥ��ݡ��Ȥ��Ƥ��ޤ���"
 
-#: calendar/gui/e-week-view.c:3268 calendar/gui/e-week-view.c:3306
+#: calendar/gui/e-week-view.c:3276 calendar/gui/e-week-view.c:3314
 msgid "New _Appointment..."
 msgstr "�������ݥ����(_A)..."
 
-#: calendar/gui/gnome-cal.c:1318
+#: calendar/gui/gnome-cal.c:1319
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "`%s' �Υե�����򳫤����Ȥ�����ޤ���Ǥ���"
 
-#: calendar/gui/gnome-cal.c:1329
+#: calendar/gui/gnome-cal.c:1330
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "'%s' �򳫤����Ȥ��׵ᤵ���᥽�åɤϥ��ݡ��Ȥ��Ƥ��ޤ���"
@@ -4907,201 +4965,201 @@ msgstr "��żԤ�ɬ�ܤǤ�"
 msgid "Could not create the component editor factory"
 msgstr "���ǥ����ե����ȥꥳ��ݡ��ͥ�Ȥ��������ޤ���Ǥ���"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "1st"
 msgstr "1 ��"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "2nd"
 msgstr "2 ��"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "3rd"
 msgstr "3 ��"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "4th"
 msgstr "4 ��"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "5th"
 msgstr "5 ��"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "6th"
 msgstr "6 ��"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "7th"
 msgstr "7 ��"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "8th"
 msgstr "8 ��"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "9th"
 msgstr "9 ��"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "10th"
 msgstr "10 ��"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "11th"
 msgstr "11 ��"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "12th"
 msgstr "12 ��"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "13th"
 msgstr "13 ��"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "14th"
 msgstr "14 ��"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "15th"
 msgstr "15 ��"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "16th"
 msgstr "16 ��"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "17th"
 msgstr "17 ��"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "18th"
 msgstr "18 ��"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "19th"
 msgstr "19 ��"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "20th"
 msgstr "20 ��"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "21st"
 msgstr "21 ��"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "22nd"
 msgstr "22 ��"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "23rd"
 msgstr "23 ��"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "24th"
 msgstr "24 ��"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "25th"
 msgstr "25 ��"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "26th"
 msgstr "26 ��"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "27th"
 msgstr "27 ��"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "28th"
 msgstr "28 ��"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "29th"
 msgstr "29 ��"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "30th"
 msgstr "30 ��"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:432
 msgid "31st"
 msgstr "31 ��"
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "Su"
 msgstr "��"
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "Mo"
 msgstr "��"
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "Tu"
 msgstr "��"
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "We"
 msgstr "��"
 
-#: calendar/gui/print.c:497
+#: calendar/gui/print.c:500
 msgid "Th"
 msgstr "��"
 
-#: calendar/gui/print.c:497
+#: calendar/gui/print.c:500
 msgid "Fr"
 msgstr "��"
 
-#: calendar/gui/print.c:497
+#: calendar/gui/print.c:500
 msgid "Sa"
 msgstr "��"
 
 #. Day
-#: calendar/gui/print.c:1827
+#: calendar/gui/print.c:1831
 msgid "Selected day (%a %b %d %Y)"
 msgstr "���򤷤����� [%Y/%m/%d (%a)]"
 
-#: calendar/gui/print.c:1846 calendar/gui/print.c:1850
+#: calendar/gui/print.c:1850 calendar/gui/print.c:1854
 msgid "%a %b %d"
 msgstr "%m/%d (%a)"
 
-#: calendar/gui/print.c:1847
+#: calendar/gui/print.c:1851
 msgid "%a %d %Y"
 msgstr "%Y/%d (%a)"
 
-#: calendar/gui/print.c:1858
+#: calendar/gui/print.c:1862
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "���򤷤��� (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1866
+#: calendar/gui/print.c:1870
 msgid "Selected month (%b %Y)"
 msgstr "���򤷤��� (%Y/%b)"
 
 #. Year
-#: calendar/gui/print.c:1873
+#: calendar/gui/print.c:1877
 msgid "Selected year (%Y)"
 msgstr "���򤷤�ǯ (%Y)"
 
-#: calendar/gui/print.c:2214
+#: calendar/gui/print.c:2221
 msgid "Print Calendar"
 msgstr "���������"
 
-#: calendar/gui/print.c:2302 calendar/gui/print.c:2394
-#: mail/mail-callbacks.c:2071 my-evolution/e-summary.c:551
+#: calendar/gui/print.c:2312 calendar/gui/print.c:2404
+#: mail/mail-callbacks.c:2080 my-evolution/e-summary.c:607
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
 msgstr "�����ץ�ӥ塼"
 
-#: calendar/gui/print.c:2331
+#: calendar/gui/print.c:2341
 msgid "Print Item"
 msgstr "�����ƥ�����"
 
-#: calendar/gui/print.c:2412
+#: calendar/gui/print.c:2422
 msgid "Print Setup"
 msgstr "�ץ�󥿤�����"
 
@@ -5295,65 +5353,82 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr ""
 
-#: camel/camel-disco-store.c:305
+#: camel/camel-disco-store.c:336
 msgid "You must be working online to complete this operation"
 msgstr "����ư���λ���뤿��˥���饤��Ǻ�Ȥ��ʤ���Фʤ�ޤ���"
 
-#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
+#: camel/camel-filter-driver.c:549 camel/camel-filter-driver.c:558
 msgid "Syncing folders"
 msgstr "�ե������Ʊ����"
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:659
 msgid "Unable to open spool folder"
 msgstr "���ס���ե�����򳫤����Ȥ�����ޤ���"
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:668
 msgid "Unable to process spool folder"
 msgstr "���ס���ե������������뤳�Ȥ�����ޤ���"
 
-#: camel/camel-filter-driver.c:667
+#: camel/camel-filter-driver.c:683
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "������ %d ������� (%d%%)"
 
-#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
+#: camel/camel-filter-driver.c:687 camel/camel-filter-driver.c:700
 #, c-format
 msgid "Failed on message %d"
 msgstr "��å����� %d �Ǽ��Ԥ��ޤ���"
 
-#: camel/camel-filter-driver.c:672
+#: camel/camel-filter-driver.c:688
 msgid "Cannot open message"
 msgstr "��å������򳫤����Ȥ�����ޤ���"
 
-#: camel/camel-filter-driver.c:698 camel/camel-filter-driver.c:814
+#: camel/camel-filter-driver.c:714 camel/camel-filter-driver.c:829
 msgid "Syncing folder"
 msgstr "�ե������Ʊ����"
 
-#: camel/camel-filter-driver.c:770
+#: camel/camel-filter-driver.c:786
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "������ %d / %d �������"
 
-#: camel/camel-filter-driver.c:775 camel/camel-filter-driver.c:793
+#: camel/camel-filter-driver.c:791 camel/camel-filter-driver.c:809
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "��å����� %d / %d �ϼ��Ԥ��ޤ���"
 
-#: camel/camel-filter-driver.c:900
+#: camel/camel-filter-driver.c:918
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "�ե��륿�ι�ʸ������˥��顼: %s: %s"
 
-#: camel/camel-filter-driver.c:906
+#: camel/camel-filter-driver.c:924
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "�ե��륿�¹���˥��顼: %s: %s"
 
-#: camel/camel-filter-search.c:479 camel/camel-filter-search.c:486
+#: camel/camel-filter-search.c:494 camel/camel-filter-search.c:501
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "�ե��륿�����¹���˥��顼: %s: %s"
 
+#: camel/camel-folder.c:472
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1039
+#, fuzzy, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr ""
+"����ɽ���Ǥθ�����¹���˥��顼: %s:\n"
+"%s"
+
+#: camel/camel-folder.c:1219
+#, fuzzy
+msgid "Moving messages"
+msgstr "%s �إ�å��������ư��"
+
 #: camel/camel-folder-search.c:333
 #, c-format
 msgid ""
@@ -5381,7 +5456,7 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr "̤�ΤΥإå��ǥ������¹Ԥ��Ƥ��ޤ�: %s"
 
-#: camel/camel-folder-search.c:747 camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:748 camel/camel-folder-search.c:792
 msgid "Invalid type in body-contains, expecting string"
 msgstr "̵���ʼ��̤���ʸ�˴ޤޤ�Ƥ��ޤ�, ʸ������Ԥ��Ƥ��ޤ�"
 
@@ -5481,76 +5556,81 @@ msgstr "�᡼���ȥե�����ν񤭹�����˥��顼: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "�᡼���ȥե�����Υ��ԡ���˥��顼: %s"
 
-#: camel/camel-pgp-context.c:193
+#: camel/camel-pgp-context.c:191
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "���ʤ��� %s �ѥ��ե졼�� ( %s ��) �����Ϥ��Ƥ�������"
 
-#: camel/camel-pgp-context.c:196
+#: camel/camel-pgp-context.c:194
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "���ʤ��� %s �ѥ��ե졼�������Ϥ��Ƥ�������"
 
-#: camel/camel-pgp-context.c:518
+#: camel/camel-pgp-context.c:525
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr "���Υ�å������˽�̾����ޤ���: ��̾����ʿʸ�ƥ����Ȥ�����ޤ���"
 
-#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:532 camel/camel-pgp-context.c:706
 msgid "Cannot sign this message: no password provided"
 msgstr "���Υ�å������˽�̾����ޤ���: �ѥ���ɤ�Ϳ�����Ƥ��ޤ���"
 
-#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:538 camel/camel-pgp-context.c:712
 #, c-format
 msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "���Υ�å������˽�̾�Ǥ��ޤ���: GPG/PGP �ؤΥѥ��פ������Ǥ��ޤ���Ǥ���: %s"
+msgstr ""
+"���Υ�å������˽�̾�Ǥ��ޤ���: GPG/PGP �ؤΥѥ��פ������Ǥ��ޤ���Ǥ���: %s"
 
-#: camel/camel-pgp-context.c:693
+#: camel/camel-pgp-context.c:699
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr "���Υ�å������˽�̾����ޤ���: ���ꥢ��̾����ʿʸ�ƥ����Ȥ�����ޤ���"
 
-#: camel/camel-pgp-context.c:886
+#: camel/camel-pgp-context.c:891
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr "��å�����������Ǥ��ޤ���: ��������ʿʸ�ƥ����Ȥ�����ޤ���"
 
-#: camel/camel-pgp-context.c:892
+#: camel/camel-pgp-context.c:897
 #, c-format
 msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "���Υ�å�����������Ǥ��ޤ���: GPG/PGP �ؤΥѥ��פ������Ǥ��ޤ���Ǥ���: %s"
+msgstr ""
+"���Υ�å�����������Ǥ��ޤ���: GPG/PGP �ؤΥѥ��פ������Ǥ��ޤ���Ǥ���: %s"
 
-#: camel/camel-pgp-context.c:903
+#: camel/camel-pgp-context.c:908
 #, c-format
 msgid "Cannot verify this message: couldn't create temp file: %s"
 msgstr "���Υ�å�����������Ǥ��ޤ���: ��ȥե����������Ǥ��ޤ���Ǥ���: %s"
 
-#: camel/camel-pgp-context.c:1069
+#: camel/camel-pgp-context.c:1076
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr "���Υ�å�������Ź沽�Ǥ��ޤ���: �Ź沽����ʿʸ�ƥ����Ȥ�����ޤ���"
 
-#: camel/camel-pgp-context.c:1079
+#: camel/camel-pgp-context.c:1086
 msgid "Cannot encrypt this message: no password provided"
 msgstr "���Υ�å�������Ź沽�Ǥ��ޤ���: �ѥ���ɤ�Ϳ�����Ƥ��ޤ���"
 
-#: camel/camel-pgp-context.c:1086
+#: camel/camel-pgp-context.c:1093
 #, c-format
 msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "���Υ�å�������Ź沽�Ǥ��ޤ���: GPG/PGP �ؤΥѥ��פ������Ǥ��ޤ���Ǥ���: %s"
+msgstr ""
+"���Υ�å�������Ź沽�Ǥ��ޤ���: GPG/PGP �ؤΥѥ��פ������Ǥ��ޤ���Ǥ���: %"
+"s"
 
-#: camel/camel-pgp-context.c:1095
+#: camel/camel-pgp-context.c:1102
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr "���Υ�å�������Ź沽�Ǥ��ޤ���: �����Ԥ����ꤵ��Ƥ��ޤ���"
 
-#: camel/camel-pgp-context.c:1258
+#: camel/camel-pgp-context.c:1264
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr "���Υ�å�����������Ǥ��ޤ���: ���椹��Ź沽�ƥ����Ȥ�����ޤ���"
 
-#: camel/camel-pgp-context.c:1266
+#: camel/camel-pgp-context.c:1272
 msgid "Cannot decrypt this message: no password provided"
 msgstr "���Υ�å�����������Ǥ��ޤ���: �ѥ���ɤ�Ϳ�����Ƥ��ޤ���"
 
-#: camel/camel-pgp-context.c:1273
+#: camel/camel-pgp-context.c:1279
 #, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
-msgstr "���Υ�å�����������Ǥ��ޤ���: GPG/PGP �ؤΥѥ��פ������Ǥ��ޤ���Ǥ���: %s"
+msgstr ""
+"���Υ�å�����������Ǥ��ޤ���: GPG/PGP �ؤΥѥ��פ������Ǥ��ޤ���Ǥ���: %s"
 
 #: camel/camel-provider.c:131
 #, c-format
@@ -5593,13 +5673,14 @@ msgstr "%s (�ݡ��� %d) ����³����ޤ���Ǥ���: %s"
 msgid "(unknown host)"
 msgstr "(̤�ΤΥۥ���)"
 
-#: camel/camel-remote-store.c:361 camel/camel-remote-store.c:423
-#: camel/camel-remote-store.c:486
+#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
+#: camel/camel-remote-store.c:483
 #: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "���ϥ���󥻥뤷�ޤ���"
 
-#: camel/camel-remote-store.c:489
+#: camel/camel-remote-store.c:486
+#, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "�����Ф�ͽ�����ʤ����Ǥ򤷤ޤ���: %s"
 
@@ -5709,7 +5790,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:492
+#: camel/providers/imap/camel-imap-store.c:494
 msgid "Bad authentication response from server."
 msgstr "�����Ф���ְ�ä�ǧ�ڱ���������ޤ���"
 
@@ -5727,7 +5808,7 @@ msgstr "̤�Τ�ǧ�ھ��֤Ǥ�"
 
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:302
-#: camel/providers/pop3/camel-pop3-provider.c:68 mail/mail-config.glade.h:54
+#: camel/providers/pop3/camel-pop3-provider.c:68 mail/mail-config.glade.h:55
 msgid "Password"
 msgstr "�ѥ����"
 
@@ -5756,37 +5837,37 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "����ɽ�����Խ��˼���: %s: %s"
 
-#: camel/camel-service.c:154
+#: camel/camel-service.c:157
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' �ϥ桼��̾����ݡ��ͥ�Ȥ�ɬ�פǤ�"
 
-#: camel/camel-service.c:162
+#: camel/camel-service.c:165
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' �ϥۥ��ȥ���ݡ��ͥ�Ȥ�ɬ�פǤ�"
 
-#: camel/camel-service.c:170
+#: camel/camel-service.c:173
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' �ϥѥ�����ݡ��ͥ�Ȥ�ɬ�פǤ�"
 
-#: camel/camel-service.c:548
+#: camel/camel-service.c:602
 #, c-format
 msgid "Resolving: %s"
 msgstr "�����: %s"
 
-#: camel/camel-service.c:575
+#: camel/camel-service.c:629
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "̾���θ����˼��Ԥ��ޤ���: %s"
 
-#: camel/camel-service.c:600
+#: camel/camel-service.c:654
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "�ۥ��Ȥθ����˼��Ԥ��ޤ���: %s: �ۥ��Ȥϸ��Ĥ���ޤ���"
 
-#: camel/camel-service.c:602
+#: camel/camel-service.c:656
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "�ۥ��Ȥθ����˼��Ԥ��ޤ���: %s: ̤�Τ���ͳ�Ǥ�"
@@ -5799,12 +5880,12 @@ msgstr "���ۥե�����᡼��ץ��Х���"
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:322 camel/camel-session.c:391
+#: camel/camel-session.c:324 camel/camel-session.c:393
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "�ץ��ȥ��� `%s' �����ѤǤ���ץ��Х����Ϥ���ޤ���"
 
-#: camel/camel-session.c:508
+#: camel/camel-session.c:510
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -5854,7 +5935,7 @@ msgstr "ǧ�ڤξ����˼��Ԥ��ޤ���"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "�ե����������Ǥ��ޤ���: ���Υ��ȥ��Ǥ����������Ǥ�"
 
-#: camel/camel-tcp-stream-openssl.c:463
+#: camel/camel-tcp-stream-openssl.c:491
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -5864,7 +5945,7 @@ msgstr ""
 "�о�: %s"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:369
+#: camel/camel-tcp-stream-openssl.c:496 camel/camel-tcp-stream-ssl.c:369
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -5903,17 +5984,37 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "URL `%s' ����Ϥ��뤳�Ȥ�����ޤ���Ǥ���"
 
-#: camel/camel-vee-folder.c:546
+#: camel/camel-vee-folder.c:554
 #, c-format
 msgid "No such message %s in %s"
 msgstr "%s �� %s �Τ褦�ʥ�å������Ϥ���ޤ���"
 
-#: camel/camel-vee-folder.c:641
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message: %s"
 msgstr "���Τ褦�ʥ�å������Ϥ���ޤ���: %s"
 
-#: camel/camel-vtrash-folder.c:106
+#: camel/camel-vee-store.c:250
+#, fuzzy, c-format
+msgid "Cannot delete folder: %s: Invalid operation"
+msgstr "�ե����������Ǥ��ޤ���: ���Υ��ȥ��Ǥ����������Ǥ�"
+
+#: camel/camel-vee-store.c:286
+#, fuzzy, c-format
+msgid "Cannot delete folder: %s: No such folder"
+msgstr "�ե�������������ޤ���: %s: %s"
+
+#: camel/camel-vee-store.c:298
+#, fuzzy, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "�ե����������Ǥ��ޤ���: ���Υ��ȥ��Ǥ����������Ǥ�"
+
+#: camel/camel-vee-store.c:326
+#, fuzzy, c-format
+msgid "Cannot rename folder: %s: No such folder"
+msgstr "�ե�������������ޤ���: %s: %s"
+
+#: camel/camel-vtrash-folder.c:109
 msgid "You cannot copy messages from this trash folder."
 msgstr "���Υ���Ȣ�ե���������å������򥳥ԡ����뤳�Ȥ�����ޤ���"
 
@@ -5961,7 +6062,7 @@ msgid "Scanning for changed messages"
 msgstr "�ѹ����줿��å�������������"
 
 #: camel/providers/imap/camel-imap-folder.c:1491
-#: camel/providers/imap/camel-imap-folder.c:1890
+#: camel/providers/imap/camel-imap-folder.c:1899
 msgid "This message is not currently available"
 msgstr "���Υ�å������ϸ������ѽ���ޤ���"
 
@@ -5974,7 +6075,7 @@ msgstr ""
 msgid "Scanning for new messages"
 msgstr "������������������"
 
-#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/imap/camel-imap-folder.c:1936
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH �����˥�å��������Τ��դ��뤳�Ȥ�����ޤ���Ǥ���"
 
@@ -5991,7 +6092,7 @@ msgstr "����å���ǥ��쥯�ȥ�򳫤����Ȥ�����ޤ���Ǥ���: %s"
 msgid "Failed to cache message %s: %s"
 msgstr "��å������Υ���å���˼��Ԥ��ޤ��� %s: %s"
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:14
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:15
 msgid "Checking for new mail"
 msgstr "����᡼��Υ����å�"
 
@@ -5999,7 +6100,7 @@ msgstr "����᡼��Υ����å�"
 msgid "Check for new messages in all folders"
 msgstr "���٤ƤΥե�����ο���᡼�������å����ޤ�"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:733
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:767
 msgid "Folders"
 msgstr "�ե����"
 
@@ -6032,28 +6133,28 @@ msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "���Υ��ץ����ϥץ쥤��ƥ����ȥѥ���ɤ�Ȥä� IMAP �����Ф���³���ޤ�"
 
-#: camel/providers/imap/camel-imap-store.c:515
+#: camel/providers/imap/camel-imap-store.c:517
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP ������ %s ���׵ᤷ��ǧ�ڥ����� %s �򥵥ݡ��Ȥ��Ƥ��ޤ���"
 
-#: camel/providers/imap/camel-imap-store.c:525
+#: camel/providers/imap/camel-imap-store.c:527
 #: camel/providers/smtp/camel-smtp-transport.c:388
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "ǧ�ڥ����� %s �򥵥ݡ��Ȥ��Ƥ��ޤ���"
 
-#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap/camel-imap-store.c:551
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s %s@%s �� IMAP �ѥ���ɤ����Ϥ��Ƥ�������"
 
-#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:566
 #: camel/providers/smtp/camel-smtp-transport.c:432
 msgid "You didn't enter a password."
 msgstr "�ѥ���ɤ����Ϥ��Ƥ��ޤ���"
 
-#: camel/providers/imap/camel-imap-store.c:590
+#: camel/providers/imap/camel-imap-store.c:592
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6064,12 +6165,12 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:889
+#: camel/providers/imap/camel-imap-store.c:891
 #, c-format
 msgid "No such folder %s"
 msgstr "���Τ褦�ʥե���� %s �Ϥ���ޤ���"
 
-#: camel/providers/imap/camel-imap-store.c:1090
+#: camel/providers/imap/camel-imap-store.c:1131
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -6101,51 +6202,51 @@ msgstr "Qmail maildir �����Υ᡼��ե�����"
 msgid "For storing local mail in qmail maildir directories."
 msgstr "qmail maildir �ǥ��쥯�ȥ�˥�������᡼�����¸"
 
-#: camel/providers/local/camel-local-provider.c:77
+#: camel/providers/local/camel-local-provider.c:78
 msgid "Standard Unix mbox spools"
 msgstr "ɸ��Ū�� UNIX �� mbox ���ס���"
 
-#: camel/providers/local/camel-local-provider.c:78
+#: camel/providers/local/camel-local-provider.c:79
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr "ɸ�� mbox �ե�����ˤ˥�������᡼�����¸���ɤ߽Ф�"
 
-#: camel/providers/local/camel-local-store.c:127
-#: camel/providers/local/camel-spool-store.c:112
+#: camel/providers/local/camel-local-store.c:132
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "��¸���줿�롼�� %s �����Хѥ��ǤϤ���ޤ���"
 
-#: camel/providers/local/camel-local-store.c:134
+#: camel/providers/local/camel-local-store.c:139
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "��¸���줿�롼�� %s ���̾�Υǥ��쥯�ȥ�ǤϤ���ޤ���"
 
-#: camel/providers/local/camel-local-store.c:142
-#: camel/providers/local/camel-local-store.c:158
+#: camel/providers/local/camel-local-store.c:147
+#: camel/providers/local/camel-local-store.c:163
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "�ե�������������ޤ���: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:173
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "��������ؤ���¸�� inbox ����Ƥޤ���"
 
-#: camel/providers/local/camel-local-store.c:183
+#: camel/providers/local/camel-local-store.c:190
 #, c-format
 msgid "Local mail file %s"
 msgstr "��������᡼��ե����� %s"
 
-#: camel/providers/local/camel-local-store.c:240
+#: camel/providers/local/camel-local-store.c:247
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "�ե������ %s ���� %s ��̾���ѹ����뤳�Ȥ�����ޤ���Ǥ���: %s"
 
-#: camel/providers/local/camel-local-store.c:282
+#: camel/providers/local/camel-local-store.c:289
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "�ե�������饵�ޥ꡼�ե����� `%s' �������뤳�Ȥ�����ޤ���Ǥ���: %s"
 
-#: camel/providers/local/camel-local-store.c:292
+#: camel/providers/local/camel-local-store.c:299
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
@@ -6429,23 +6530,26 @@ msgstr "MH �ǥ��쥯�ȥ�ѥ��򳫤����Ȥ�����ޤ���: %s: %s"
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "���ס���ե�����˥�å��������ɲý���ޤ���: %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:133
+#: camel/providers/local/camel-spool-store.c:116
+#, c-format
 msgid "Spool `%s' does not exist or is not a regular file"
 msgstr "���ס���`%s' ��¸�ߤ��ʤ����̾�Υե�����ǤϤ���ޤ���"
 
-#: camel/providers/local/camel-spool-store.c:159
+#: camel/providers/local/camel-spool-store.c:142
+#, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "�ե���� `%s/%s' ��¸�ߤ��ޤ���"
 
-#: camel/providers/local/camel-spool-store.c:181
+#: camel/providers/local/camel-spool-store.c:164
+#, c-format
 msgid "Spool mail file %s"
 msgstr "���ס���᡼��ե����� %s"
 
-#: camel/providers/local/camel-spool-store.c:227
+#: camel/providers/local/camel-spool-store.c:210
 msgid "Spool folders cannot be renamed"
 msgstr "���ס���ե�����ϥ�͡���Ǥ��ޤ���"
 
-#: camel/providers/local/camel-spool-store.c:235
+#: camel/providers/local/camel-spool-store.c:218
 msgid "Spool folders cannot be deleted"
 msgstr "���ס���ե�����Ϻ���Ǥ��ޤ���"
 
@@ -6487,6 +6591,7 @@ msgid ""
 msgstr ""
 
 #: camel/providers/local/camel-spool-summary.c:941
+#, c-format
 msgid "Could not file: %s: %s"
 msgstr "�ե��������ޤ���Ǥ���: %s: %s"
 
@@ -6567,29 +6672,30 @@ msgstr "POP ���ޥ�������"
 msgid "Could not check POP server for new messages: %s"
 msgstr "POP �����Фǿ�����å�����������å����뤳�Ȥ�����ޤ���Ǥ���: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:235
+#: camel/providers/pop3/camel-pop3-folder.c:242
 msgid "Could not open folder: message listing was incomplete."
 msgstr "�ե�����򳫤��ޤ���Ǥ���: ��å������ꥹ�Ȥ�̤�����Ǥ�"
 
-#: camel/providers/pop3/camel-pop3-folder.c:259
+#: camel/providers/pop3/camel-pop3-folder.c:266
 msgid "Expunging deleted messages"
 msgstr "������줿��å�������õ�ޤ�"
 
-#: camel/providers/pop3/camel-pop3-folder.c:335
+#: camel/providers/pop3/camel-pop3-folder.c:342
+#, c-format
 msgid "Could not fetch message: %s"
 msgstr "��å��������������ޤ���Ǥ���: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:351
+#: camel/providers/pop3/camel-pop3-folder.c:358
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "POP ������ %s �����å��������������ޤ���Ǥ���: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:374
+#: camel/providers/pop3/camel-pop3-folder.c:381
 #, c-format
 msgid "No message with uid %s"
 msgstr "uid %s �Υ�å������Ϥ���ޤ���"
 
-#: camel/providers/pop3/camel-pop3-folder.c:378
+#: camel/providers/pop3/camel-pop3-folder.c:385
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "POP ������ %d �������"
@@ -6607,7 +6713,7 @@ msgstr "�����Ф˥�å�������Ĥ�"
 msgid "Delete after %s day(s)"
 msgstr "%s ����˺������"
 
-#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:53
+#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:54
 msgid "POP"
 msgstr "POP"
 
@@ -6695,11 +6801,12 @@ msgid "No such folder `%s'."
 msgstr "���Τ褦�ʥե���� `%s' �Ϥ���ޤ���"
 
 #: camel/providers/pop3/camel-pop3-store.c:567
+#, c-format
 msgid "Unexpected response from POP server: %s"
 msgstr "POP�����Ф���ͽ�����ʤ�����������ޤ���: %s"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:73
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -6753,7 +6860,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "sendmail ��ͳ�ǥ᡼����ۿ�"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:66
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -7129,10 +7236,12 @@ msgid "Attach a file"
 msgstr "�ե������ź�դ��ޤ�"
 
 #: composer/e-msg-composer.c:676
+#, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
-msgstr "�ե�������ɤ߹�����˥��顼: %s\n"
+msgstr ""
+"�ե�������ɤ߹�����˥��顼: %s\n"
 "%s"
 
 #: composer/e-msg-composer.c:858
@@ -7175,6 +7284,7 @@ msgid "Unable to retrieve message from editor"
 msgstr "���ǥ��������å��������������ޤ���Ǥ���"
 
 #: composer/e-msg-composer.c:1050
+#, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
@@ -7183,6 +7293,7 @@ msgstr ""
 "%s"
 
 #: composer/e-msg-composer.c:1056
+#, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
@@ -7191,6 +7302,7 @@ msgstr ""
 "%s"
 
 #: composer/e-msg-composer.c:1065
+#, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
@@ -7367,13 +7479,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:309 e-util/e-time-utils.c:396
-#: widgets/misc/e-dateedit.c:1360 widgets/misc/e-dateedit.c:1587
+#: widgets/misc/e-dateedit.c:1385 widgets/misc/e-dateedit.c:1612
 msgid "%I:%M %p"
 msgstr "%p %I:%M"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:313 e-util/e-time-utils.c:388
-#: widgets/misc/e-dateedit.c:1357 widgets/misc/e-dateedit.c:1584
+#: widgets/misc/e-dateedit.c:1382 widgets/misc/e-dateedit.c:1609
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -7522,8 +7634,8 @@ msgstr ""
 "�ե�����������˺��Ƥ��ޤ�\n"
 "��äƥ᡼�����������ͭ���ʥե��������ꤷ�Ƥ�������"
 
-#: filter/filter-folder.c:232 filter/vfolder-rule.c:351
-#: mail/mail-account-gui.c:820
+#: filter/filter-folder.c:232 filter/vfolder-rule.c:356
+#: mail/mail-account-gui.c:822
 msgid "Select Folder"
 msgstr "�ե����������"
 
@@ -7773,7 +7885,7 @@ msgstr "�ֿ���"
 msgid "Score"
 msgstr "��Ͽ"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1242
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1251
 msgid "Sender"
 msgstr "������"
 
@@ -7805,7 +7917,7 @@ msgstr "�����Τ�Τdz��Ϥ���"
 msgid "Stop Processing"
 msgstr "�������"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:893
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:917
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "��̾"
@@ -7834,7 +7946,7 @@ msgstr "�롼����Խ�"
 msgid "Score Rules"
 msgstr "�������롼��"
 
-#: filter/vfolder-rule.c:203
+#: filter/vfolder-rule.c:206
 msgid "Oops.  You need to to specify at least one folder as a source."
 msgstr ""
 
@@ -7852,19 +7964,19 @@ msgstr "����ݡ�����..."
 msgid "Please wait"
 msgstr "���Ф餯���Ԥ���������"
 
-#: importers/elm-importer.c:171 importers/netscape-importer.c:701
+#: importers/elm-importer.c:171 importers/netscape-importer.c:708
 #: importers/pine-importer.c:369
 #, c-format
 msgid "Importing %s as %s"
 msgstr "%s �� %s �Ȥ��ƥ���ݡ�����"
 
-#: importers/elm-importer.c:377 importers/netscape-importer.c:794
+#: importers/elm-importer.c:377 importers/netscape-importer.c:801
 #: importers/pine-importer.c:506
 #, c-format
 msgid "Scanning %s"
 msgstr "%s ��������"
 
-#: importers/elm-importer.c:528 importers/netscape-importer.c:967
+#: importers/elm-importer.c:528 importers/netscape-importer.c:974
 #: importers/pine-importer.c:669 mail/component-factory.c:96
 msgid "Mail"
 msgstr "�᡼��"
@@ -7901,19 +8013,19 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: importers/netscape-importer.c:897 importers/pine-importer.c:602
+#: importers/netscape-importer.c:904 importers/pine-importer.c:602
 msgid "Scanning directory"
 msgstr "�ǥ��쥯�ȥ��������"
 
-#: importers/netscape-importer.c:906
+#: importers/netscape-importer.c:913
 msgid "Starting import"
 msgstr "����ݡ��ȳ���"
 
-#: importers/netscape-importer.c:972
+#: importers/netscape-importer.c:979
 msgid "Settings"
 msgstr "����"
 
-#: importers/netscape-importer.c:993
+#: importers/netscape-importer.c:1000
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -7997,19 +8109,25 @@ msgstr "�ץ��ѥƥ�..."
 msgid "Change this folder's properties"
 msgstr "���Υե�����Υץ��ѥƥ����ѹ�"
 
-#: mail/component-factory.c:790
+#: mail/component-factory.c:698
+msgid ""
+"Some of your mail settings seem corrupt, please check that everything is in "
+"order."
+msgstr ""
+
+#: mail/component-factory.c:812
 msgid "New Mail Message"
 msgstr "�����᡼���å�����"
 
-#: mail/component-factory.c:790
+#: mail/component-factory.c:812
 msgid "New _Mail Message"
 msgstr "�����᡼���å�����(_M)"
 
-#: mail/component-factory.c:821
+#: mail/component-factory.c:843
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolution �᡼�륳��ݡ��ͥ�Ȥν����������ޤ���"
 
-#: mail/component-factory.c:1007
+#: mail/component-factory.c:1032
 msgid "Cannot register storage with shell"
 msgstr "������ǥ��ȥ졼������Ͽ����ޤ���"
 
@@ -8022,159 +8140,159 @@ msgstr "\"%s\" �Υץ��ѥƥ�"
 msgid "Properties"
 msgstr "�ץ��ѥƥ�"
 
-#: mail/folder-browser.c:239 mail/mail-display.c:275
+#: mail/folder-browser.c:262 mail/mail-display.c:275
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "��ȥǥ��쥯�ȥ���������ޤ���Ǥ���: %s"
 
-#: mail/folder-browser.c:708
+#: mail/folder-browser.c:734
 #, c-format
 msgid "%d new"
 msgstr "����%d��"
 
-#: mail/folder-browser.c:711 mail/folder-browser.c:716
-#: mail/folder-browser.c:720
+#: mail/folder-browser.c:737 mail/folder-browser.c:742
+#: mail/folder-browser.c:746
 msgid ", "
 msgstr ","
 
-#: mail/folder-browser.c:712
+#: mail/folder-browser.c:738
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/folder-browser.c:717
+#: mail/folder-browser.c:743
 #, c-format
 msgid "%d selected"
 msgstr "%d �����"
 
-#: mail/folder-browser.c:722
+#: mail/folder-browser.c:748
 #, c-format
 msgid "%d unsent"
 msgstr "%d ̤����"
 
-#: mail/folder-browser.c:724
+#: mail/folder-browser.c:750
 #, c-format
 msgid "%d total"
 msgstr "���%d��"
 
-#: mail/folder-browser.c:958
+#: mail/folder-browser.c:993
 msgid "Create vFolder from Search"
 msgstr "�������鲾�ۥե��������"
 
-#: mail/folder-browser.c:1303
+#: mail/folder-browser.c:1338
 msgid "VFolder on _Subject"
 msgstr "��̾�β��ۥե����(_S)"
 
-#: mail/folder-browser.c:1306
+#: mail/folder-browser.c:1341
 msgid "VFolder on Se_nder"
 msgstr "�����Ԥβ��ۥե����(_N)"
 
-#: mail/folder-browser.c:1309
+#: mail/folder-browser.c:1344
 msgid "VFolder on _Recipients"
 msgstr "�����Ԥβ��ۥե����(_R)"
 
-#: mail/folder-browser.c:1312
+#: mail/folder-browser.c:1347
 msgid "VFolder on Mailing _List"
 msgstr "�᡼��󥰥ꥹ�Ȥβ��ۥե����(_L)"
 
-#: mail/folder-browser.c:1318
+#: mail/folder-browser.c:1353
 msgid "Filter on Sub_ject"
 msgstr "��̾�Υե��륿(_J)"
 
-#: mail/folder-browser.c:1321
+#: mail/folder-browser.c:1356
 msgid "Filter on Sen_der"
 msgstr "�����ԤΥե��륿(_D)"
 
-#: mail/folder-browser.c:1324
+#: mail/folder-browser.c:1359
 msgid "Filter on Re_cipients"
 msgstr "�����ԤΥե��륿(_C)"
 
-#: mail/folder-browser.c:1327
+#: mail/folder-browser.c:1362
 msgid "Filter on _Mailing List"
 msgstr "�᡼��󥰥ꥹ�ȤΥե��륿(_M)"
 
-#: mail/folder-browser.c:1338 ui/evolution-mail-message.xml.h:89
+#: mail/folder-browser.c:1373 ui/evolution-mail-message.xml.h:89
 msgid "_Edit as New Message..."
 msgstr "������å������Ȥ����Խ�..."
 
-#: mail/folder-browser.c:1340 ui/evolution-mail-message.xml.h:97
+#: mail/folder-browser.c:1375 ui/evolution-mail-message.xml.h:97
 msgid "_Save As..."
 msgstr "��̾����¸(_S)..."
 
-#: mail/folder-browser.c:1342
+#: mail/folder-browser.c:1377
 msgid "_Print"
 msgstr "����(_P)"
 
-#: mail/folder-browser.c:1347 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1382 ui/evolution-mail-message.xml.h:96
 msgid "_Reply to Sender"
 msgstr "�����Ԥ��ֿ�(_R)"
 
-#: mail/folder-browser.c:1349 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1384 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _List"
 msgstr "�ꥹ�Ȥ��ֿ�(_L)"
 
-#: mail/folder-browser.c:1351 ui/evolution-mail-message.xml.h:68
+#: mail/folder-browser.c:1386 ui/evolution-mail-message.xml.h:68
 msgid "Reply to _All"
 msgstr "�������ֿ�(_A)"
 
-#: mail/folder-browser.c:1353
+#: mail/folder-browser.c:1388
 msgid "_Forward"
 msgstr "ž��(_F)"
 
-#: mail/folder-browser.c:1356 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1391 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "�����ѤߤȤ��ƥޡ���(_K)"
 
-#: mail/folder-browser.c:1358 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1393 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "̤�ɤȤ��ƥޡ���(_N)"
 
-#: mail/folder-browser.c:1360
+#: mail/folder-browser.c:1395
 msgid "Mark as _Important"
 msgstr "���פȤ��ƥޡ���(_I)"
 
-#: mail/folder-browser.c:1362
+#: mail/folder-browser.c:1397
 msgid "Mark as Unim_portant"
 msgstr "����פȤ��ƥޡ���(_P)"
 
-#: mail/folder-browser.c:1367
+#: mail/folder-browser.c:1402
 msgid "_Move to Folder..."
 msgstr "�ե�����ذ�ư(_M)..."
 
-#: mail/folder-browser.c:1369
+#: mail/folder-browser.c:1404
 msgid "_Copy to Folder..."
 msgstr "�ե�����إ��ԡ�(_C)..."
 
-#: mail/folder-browser.c:1373 ui/evolution-mail-message.xml.h:99
+#: mail/folder-browser.c:1408 ui/evolution-mail-message.xml.h:99
 msgid "_Undelete"
 msgstr "������(_U)"
 
-#: mail/folder-browser.c:1378
+#: mail/folder-browser.c:1413
 msgid "Add Sender to Address Book"
 msgstr "�����Ԥ򥢥ɥ쥹Ģ���ɲ�"
 
-#: mail/folder-browser.c:1383
+#: mail/folder-browser.c:1418
 msgid "Apply Filters"
 msgstr "�ե��륿Ŭ��"
 
-#: mail/folder-browser.c:1387
+#: mail/folder-browser.c:1422
 msgid "Create Ru_le From Message"
 msgstr "��å���������롼������(_L)"
 
-#: mail/folder-browser.c:1538
+#: mail/folder-browser.c:1573
 msgid "Filter on Mailing List"
 msgstr "�᡼��󥰥ꥹ�ȤΥե��륿"
 
-#: mail/folder-browser.c:1539
+#: mail/folder-browser.c:1574
 msgid "VFolder on Mailing List"
 msgstr "�᡼��󥰥ꥹ�Ȥβ��ۥե����"
 
-#: mail/folder-browser.c:1541
+#: mail/folder-browser.c:1576
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "�᡼��󥰥ꥹ�ȤΥե��륿 (%s)"
 
-#: mail/folder-browser.c:1542
+#: mail/folder-browser.c:1577
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "�᡼��󥰥ꥹ�Ȥβ��ۥե���� (%s)"
@@ -8247,15 +8365,15 @@ msgstr "Evolution �˥塼�����ǥ���"
 msgid "Evolution Account Editor"
 msgstr "Evolution ��������ȥ��ǥ���"
 
-#: mail/mail-account-gui.c:945
+#: mail/mail-account-gui.c:947
 msgid "Could not save signature file."
 msgstr "��̾�ե��������¸����ޤ���Ǥ���"
 
-#: mail/mail-account-gui.c:1022
+#: mail/mail-account-gui.c:1024
 msgid "Save signature"
 msgstr "��̾����¸"
 
-#: mail/mail-account-gui.c:1028
+#: mail/mail-account-gui.c:1030
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -8265,7 +8383,7 @@ msgstr ""
 "\n"
 "�ѹ�����¸���ޤ���?"
 
-#: mail/mail-account-gui.c:1611
+#: mail/mail-account-gui.c:1615
 msgid "You may not create two accounts with the same name."
 msgstr "Ʊ��̾���Υ�������Ȥ�2�ĺ����Ǥ��ޤ���"
 
@@ -8298,7 +8416,7 @@ msgid "Are you sure you want to delete this news account?"
 msgstr "������ news ��������Ȥ������Ƥ��������Ǥ���?"
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:757 mail/mail-config.glade.h:42
+#: mail/mail-accounts.c:760 mail/mail-config.glade.h:45
 msgid "Mail Settings"
 msgstr "�᡼������"
 
@@ -8398,36 +8516,36 @@ msgstr ""
 msgid "This message contains invalid recipients:"
 msgstr "���Υ�å���������Ŭ�ڤʼ����Ԥ�ޤ�Ǥ��ޤ�:"
 
-#: mail/mail-callbacks.c:453
+#: mail/mail-callbacks.c:454
 msgid "You must specify recipients in order to send this message."
 msgstr "���Υ�å���������������Ŭ�ڤʼ����Ԥ���ꤷ�ʤ���Фʤ�ޤ���"
 
-#: mail/mail-callbacks.c:549
+#: mail/mail-callbacks.c:550
 msgid "You must configure an account before you can send this email."
 msgstr "���Υ᡼��������������˥�������Ȥ����ꤷ�ʤ���Фʤ�ޤ���"
 
-#: mail/mail-callbacks.c:779
+#: mail/mail-callbacks.c:783
 msgid "an unknown sender"
 msgstr "������������"
 
-#: mail/mail-callbacks.c:784
+#: mail/mail-callbacks.c:788
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "%Yǯ%m��%d��(%a)��%H��%Mʬ�� %%s ۩��:"
 
-#: mail/mail-callbacks.c:1162
+#: mail/mail-callbacks.c:1171
 msgid "Move message(s) to"
 msgstr "��å��������ư���ޤ�: "
 
-#: mail/mail-callbacks.c:1164
+#: mail/mail-callbacks.c:1173
 msgid "Copy message(s) to"
 msgstr "��å������򥳥ԡ����ޤ�: "
 
-#: mail/mail-callbacks.c:1538
+#: mail/mail-callbacks.c:1547
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "������ %d ��å��������Խ����Ƥ��������Ǥ���?"
 
-#: mail/mail-callbacks.c:1560
+#: mail/mail-callbacks.c:1569
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -8435,7 +8553,7 @@ msgstr ""
 "�ɥ�եȥե���������¸���줿\n"
 "��å������������Խ����뤳�Ȥ�����ޤ�"
 
-#: mail/mail-callbacks.c:1594
+#: mail/mail-callbacks.c:1603
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -8443,44 +8561,44 @@ msgstr ""
 "�����ե�����Υ�å���������\n"
 "���������뤳�Ȥ�����ޤ�"
 
-#: mail/mail-callbacks.c:1606
+#: mail/mail-callbacks.c:1615
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "������ %d ��å�������������Ƥ��������Ǥ���?"
 
-#: mail/mail-callbacks.c:1627
+#: mail/mail-callbacks.c:1636
 msgid "No Message Selected"
 msgstr "���򤵤줿��å������Ϥ���ޤ���"
 
-#: mail/mail-callbacks.c:1712
+#: mail/mail-callbacks.c:1721
 msgid "Save Message As..."
 msgstr "��å���������̾����¸..."
 
-#: mail/mail-callbacks.c:1714
+#: mail/mail-callbacks.c:1723
 msgid "Save Messages As..."
 msgstr "��å���������̾����¸..."
 
-#: mail/mail-callbacks.c:1859 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:1868 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "�ٹ�"
 
-#: mail/mail-callbacks.c:1864
+#: mail/mail-callbacks.c:1873
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
-"�������Ϻ���˥ޡ�������Ƥ��뤹�٤ƤΥ�å�������õ�ޤ�������³��"
-"����ȡ������Υ�å������򸵤��᤻�ʤ��ʤ�ޤ���\n"
+"�������Ϻ���˥ޡ�������Ƥ��뤹�٤ƤΥ�å�������õ�ޤ�������³�Ԥ�"
+"��ȡ������Υ�å������򸵤��᤻�ʤ��ʤ�ޤ���\n"
 "\n"
 "�����ˤ����Υ�å�������õ�ޤ���?"
 
-#: mail/mail-callbacks.c:1871
+#: mail/mail-callbacks.c:1880
 msgid "Do not ask me again."
 msgstr "���٤ȼ��䤷�ʤ�"
 
-#: mail/mail-callbacks.c:1976
+#: mail/mail-callbacks.c:1985
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -8489,19 +8607,19 @@ msgstr ""
 "�ե��륿����Υ�������˥��顼:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1986
+#: mail/mail-callbacks.c:1995
 msgid "Filters"
 msgstr "�ե��륿"
 
-#: mail/mail-callbacks.c:2032
+#: mail/mail-callbacks.c:2041
 msgid "Print Message"
 msgstr "�����������"
 
-#: mail/mail-callbacks.c:2078
+#: mail/mail-callbacks.c:2087
 msgid "Printing of message failed"
 msgstr "��å������ΰ����˼��Ԥ��ޤ���"
 
-#: mail/mail-callbacks.c:2162
+#: mail/mail-callbacks.c:2171
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "������ %d ��å��������̥�����ɥ��dz����Ƥ��������Ǥ���?"
@@ -8522,8 +8640,8 @@ msgid ""
 "not sure, ask your system\n"
 "administrator or Internet Service Provider."
 msgstr ""
-"�ʲ��˥᡼�륵���ФĤ��Ƥξ�������Ϥ��Ƥ����������⤷�褯ʬ����ʤ����"
-"�����ƥ�����Ԥ����󥿡��ͥåȥץ��Х��������̤��ƤߤƤ���������"
+"�ʲ��˥᡼�륵���ФĤ��Ƥξ�������Ϥ��Ƥ����������⤷�褯ʬ����ʤ���Х���"
+"�ƥ�����Ԥ����󥿡��ͥåȥץ��Х��������̤��ƤߤƤ���������"
 
 #: mail/mail-config-druid.c:139
 msgid "Please select among the following options"
@@ -8564,85 +8682,107 @@ msgstr ""
 msgid "Evolution Account Assistant"
 msgstr "Evolution��������ȥ����������"
 
-#: mail/mail-config.c:1486
-msgid "Evolution Shortcuts"
-msgstr "Evolution ���硼�ȥ��å�"
+#: mail/mail-config.c:315
+#, fuzzy, c-format
+msgid "Account %d"
+msgstr "���������"
 
-#. right now, the URL always works basically as a matter of luck...
-#. * both IMAP and mbox spool stores have INBOX as their inbox folder
-#. * name. I don't think this will work with maildir. How can we figure out
-#. * what shortcut to insert?
-#.
 #: mail/mail-config.c:1618
 #, c-format
+msgid ""
+"Could not get inbox for new mail store:\n"
+"%s\n"
+"No shortcut will be created."
+msgstr ""
+
+#. Create the shortcut. FIXME: This only works if the
+#. * full name matches the path.
+#.
+#: mail/mail-config.c:1629
+#, c-format
 msgid "%s: Inbox"
 msgstr "%s: ����Ȣ"
 
-#: mail/mail-config.c:1851
+#: mail/mail-config.c:1873
 msgid "Checking Service"
 msgstr "�����ӥ�������å���"
 
-#: mail/mail-config.c:1922 mail/mail-config.c:1925
+#: mail/mail-config.c:1944 mail/mail-config.c:1947
 msgid "Connecting to server..."
 msgstr "�����Ф���³��..."
 
 #: mail/mail-config.glade.h:1
+#, fuzzy
+msgid " _Check for supported types "
+msgstr "���ݡ��Ȥ��줿���̤�����å�(_C)"
+
+#: mail/mail-config.glade.h:2
 msgid " color"
 msgstr " ���顼"
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(���� Evolution �� SSL �򥵥ݡ��Ȥ��Ƥ��ޤ���)"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr "���������"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr "��������Ⱦ���"
 
-#: mail/mail-config.glade.h:5 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:6 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "��������ȴ���"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "Accounts"
 msgstr "���������"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr "�Ź沽�����᡼�������������˾�˼�ʬ���Ȥ˰Ź沽���ޤ�"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr "�Ź沽�����᡼�������������˾�˼�ʬ���Ȥ˰Ź沽���ޤ�"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:10
 msgid "Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:10 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "ź��"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:12
 msgid "Authentication"
 msgstr "ǧ��"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:13
 msgid "Authentication Type: "
 msgstr "ǧ�ڼ���: "
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:14
 msgid "Certificate ID:"
 msgstr "ǧ�� ID"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:16
 msgid "Composer"
 msgstr "�᡼�����"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:17
+#, fuzzy
+msgid "Configuration"
+msgstr "�᡼�������"
+
+#: mail/mail-config.glade.h:18
+#, fuzzy
+msgid "Confirm when Expunging a folder"
+msgstr "�ե����������"
+
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -8658,237 +8798,225 @@ msgstr ""
 "\n"
 "\"��λ\" �򥯥�å������������¸���Ƥ�������"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr "�ǥե����(_F)"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:26
 msgid "Default Forward style is: "
 msgstr "�ǥե���Ȥ�ž����ˡ: "
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:27
 msgid "Default character encoding: "
 msgstr "�ǥե���ȤΥ���饯�����󥳡��ǥ���: "
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:29
 msgid "Digital IDs..."
 msgstr "�ǥ����� ID..."
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:30
 msgid "Display"
 msgstr "ɽ��"
 
-#: mail/mail-config.glade.h:27 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:31 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "��λ"
 
-#: mail/mail-config.glade.h:28 shell/e-local-storage.c:174
+#: mail/mail-config.glade.h:32 shell/e-local-storage.c:174
 msgid "Drafts"
 msgstr "���"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:33
 msgid "Drafts folder:"
 msgstr "��ƥե����:"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:34
 msgid "E_nable"
 msgstr "ͭ��(_E)"
 
-#: mail/mail-config.glade.h:31
-msgid "Each account must have a different name."
-msgstr "���줾�쥢������Ȥϰۤʤ�̾���Ǥʤ��ƤϤʤ�ޤ���"
-
-#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:96
 #: widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr "�Խ�..."
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:36
 msgid "Enabled"
 msgstr "ͭ��"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:37
 msgid "Get Digital ID..."
 msgstr "�ǥ�����ID �����..."
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:38
 msgid "HTML signature file:"
 msgstr "HTML ��̾�ե�����:"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:39
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:40 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "�桼������"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:41
 msgid "In HTML mail"
 msgstr "HTML �᡼��"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:42
 msgid "Inline"
 msgstr "����饤��"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:43
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:44
 msgid "Mail Configuration"
 msgstr "�᡼�������"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:46
 msgid "Mailbox location"
 msgstr "�᡼��ܥå����ξ��"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:47
 msgid "Make this my _default account"
 msgstr "���Υ�������Ȥ��������ꤹ��(_D)"
 
-#: mail/mail-config.glade.h:45
-msgid "Message _preview should be displayed by default"
-msgstr "��å������ץ�ӥ塼��ǥե���Ȥ�ɽ������(_P)"
-
-#: mail/mail-config.glade.h:46
-msgid "Message list should display in a _threaded fashion by default"
-msgstr "��å������ꥹ�Ȥ�ǥե���Ȥǥ���åɲ�����(_T)"
-
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 msgid "NNTP Server:"
 msgstr "NNTP ������:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:49
 msgid "News"
 msgstr "�˥塼��"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:51
 msgid "Optional Information"
 msgstr "���ץ����"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:53
 msgid "PGP Key ID:"
 msgstr "PGP���� ID:"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 msgid "Pick a color"
 msgstr "���顼������"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 msgid "Pretty Good Privacy"
 msgstr "�ץ�ƥ����åɥץ饤�Х���(PGP)"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 msgid "Prompt when sending messages with an _empty subject"
 msgstr "�������˷�̾�����ξ����Τ餻��(_E)"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr "�������� Bcc �������ꤵ��Ƥ��ʤ������Τ餻��(_B)"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:60
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:61
 msgid "Quoted"
 msgstr "����"
 
-#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "�᡼��μ�����"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:63
 msgid "Receiving Mail"
 msgstr "�᡼��μ���"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:64
 msgid "Receiving Options"
 msgstr "�������ץ����"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:65
 msgid "Required Information"
 msgstr "ɬ�ܾ���"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:67
 msgid "Secure MIME"
 msgstr "�����奢 MIME"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:68
 msgid "Security"
 msgstr "�������ƥ�"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:69
 msgid "Select Filter Log file..."
 msgstr "�ե��륿�������ե����������..."
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:70
 msgid "Select PGP binary"
 msgstr "PGP �ץ�����������"
 
-#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:71 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "�᡼���������"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:72
 msgid "Sending Mail"
 msgstr "�᡼�������"
 
-#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:74 mail/message-list.etspec.h:6
 #: shell/e-local-storage.c:177
 msgid "Sent"
 msgstr "������"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:75
 msgid "Sent and Draft Messages"
 msgstr "�����Ѥ���ƥ�å�����"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:76
 msgid "Sent messages folder:"
 msgstr "�����ѥ�å������ե����:"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:77
 msgid "Server Configuration"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 msgid "Server Type: "
 msgstr "�������:"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 msgid "Server requires _authentication"
 msgstr "�����Ф�ǧ�ڤ�ɬ��(_A)"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:80
 msgid "Signature file:"
 msgstr "��̾�ե�����:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "Source"
 msgstr "������"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 msgid "Source Information"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:83
 msgid "Sources"
 msgstr "������"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
 msgid "Special Folders"
 msgstr "���̤ʥե����"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:85
 msgid "Standard Unix mbox"
 msgstr "ɸ��Ū�� UNIX �� mbox �ե�����"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:87
 msgid "Use secure connection (_SSL)"
 msgstr "�������ƥ����ݸ�줿��³ (_SSL) ��ɬ��"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:88
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -8898,80 +9026,76 @@ msgstr ""
 "\n"
 "\"��\" �򥯥�å����ƻϤ�Ƥ�������"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "_Always load images off the net"
 msgstr "��˲������ɤ߹��ޤʤ�"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:93
 msgid "_Automatically check for new mail every"
 msgstr "����᡼���ưŪ�˥����å�����ֳ�(_A)"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:94
 msgid "_Check for supported types"
 msgstr "���ݡ��Ȥ��줿���̤�����å�(_C)"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:97
 msgid "_Email Address:"
 msgstr "�᡼�륢�ɥ쥹(_E):"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:98
 msgid "_Empty trash folders on exit"
 msgstr "��λ���˥���Ȣ����ˤ���(_E)"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 msgid "_Full Name:"
 msgstr "�ե�͡���(_F):"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "_HTML Signature:"
 msgstr "HTML��̾�ե�����(_H):"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 msgid "_Highlight citations with"
 msgstr "���Ѥ�Ĵ����(_H)"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:102
 msgid "_Host:"
 msgstr "�ۥ���(_H):"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 msgid "_Load images if sender is in addressbook"
 msgstr "�����Ԥ����ɥ쥹Ģ�ˤ�����������ɤ߹���"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 msgid "_Log filter actions to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 msgid "_Mark messages as Read after"
 msgstr "���λ��֥ץ�ӥ塼����ȥ�å����������Ѥߤˤ���(_M):"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "_Name:"
 msgstr "̾��(_N):"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 #, fuzzy
 msgid "_Never load images off the net"
 msgstr "���٤Ȳ������ɤ߹��ޤʤ�"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 msgid "_Organization:"
 msgstr "���(_O):"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:109
 msgid "_PGP binary path:"
 msgstr "_PGP �ץ������Υѥ�:"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 msgid "_Path:"
 msgstr "�ѥ�(_P):"
 
-#: mail/mail-config.glade.h:110
-msgid "_Remember PGP Passphrase until exit"
-msgstr "��λ����ޤ� PGP �ѥ��ե졼���򵭲�����(_R)"
-
 #: mail/mail-config.glade.h:111
 msgid "_Remember this password"
 msgstr "���Υѥ���ɤ򵭲�(_R)"
@@ -9004,39 +9128,39 @@ msgstr ""
 msgid "seconds."
 msgstr " ��"
 
-#: mail/mail-crypto.c:60
+#: mail/mail-crypto.c:59
 msgid "Could not create a PGP signature context."
 msgstr "PGP ��̾����ƥ����Ȥ��������ޤ���Ǥ���"
 
-#: mail/mail-crypto.c:86
+#: mail/mail-crypto.c:84
 msgid "Could not create a PGP verification context."
 msgstr "PGP ���ڥ���ƥ����Ȥ��������ޤ���Ǥ���"
 
-#: mail/mail-crypto.c:116
+#: mail/mail-crypto.c:113
 msgid "Could not create a PGP encryption context."
 msgstr "PGP �Ź楳��ƥ����Ȥ��������ޤ���Ǥ���"
 
-#: mail/mail-crypto.c:142
+#: mail/mail-crypto.c:138
 msgid "Could not create a PGP decryption context."
 msgstr "PGP ���楳��ƥ����Ȥ��������ޤ���Ǥ���"
 
-#: mail/mail-crypto.c:177
+#: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
 msgstr "S/MIME ��̾����ƥ����Ȥ��������ޤ���Ǥ���"
 
-#: mail/mail-crypto.c:209
+#: mail/mail-crypto.c:205
 msgid "Could not create a S/MIME certsonly context."
 msgstr "S/MIME ����ƥ����Ȥ��������ޤ���Ǥ���"
 
-#: mail/mail-crypto.c:240
+#: mail/mail-crypto.c:236
 msgid "Could not create a S/MIME encryption context."
 msgstr "S/MIME �Ź楳��ƥ����Ȥ��������ޤ���Ǥ���"
 
-#: mail/mail-crypto.c:271
+#: mail/mail-crypto.c:267
 msgid "Could not create a S/MIME envelope context."
 msgstr "S/MIME ����٥����ץ���ƥ����Ȥ��������ޤ���Ǥ���"
 
-#: mail/mail-crypto.c:301
+#: mail/mail-crypto.c:297
 msgid "Could not create a S/MIME decode context."
 msgstr "S/MIME �ǥ����ɥ���ƥ����Ȥ��������ޤ���Ǥ���"
 
@@ -9082,11 +9206,11 @@ msgstr "�֥饦���ǥ�󥯤򳫤�"
 msgid "Copy Link Location"
 msgstr "���򥳥ԡ�"
 
-#: mail/mail-display.c:1519
+#: mail/mail-display.c:1520
 msgid "Save Link as (FIXME)"
 msgstr "��󥯤���̾����¸"
 
-#: mail/mail-display.c:1521
+#: mail/mail-display.c:1523
 msgid "Save Image as..."
 msgstr "��������¸..."
 
@@ -9103,84 +9227,84 @@ msgstr "MIME ��å���������Ͻ���ޤ���Ǥ���, ��������ɽ�����ޤ�"
 msgid "Date"
 msgstr "����"
 
-#: mail/mail-format.c:860
+#: mail/mail-format.c:862
 msgid "Bad Address"
 msgstr "�������ɥ쥹:"
 
-#: mail/mail-format.c:882 mail/message-list.etspec.h:3
+#: mail/mail-format.c:903 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "���п�"
 
-#: mail/mail-format.c:885
+#: mail/mail-format.c:906
 msgid "Reply-To"
 msgstr "�ֿ���"
 
-#: mail/mail-format.c:888 mail/message-list.etspec.h:10
+#: mail/mail-format.c:910 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "����"
 
-#: mail/mail-format.c:891
+#: mail/mail-format.c:914
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:1311
+#: mail/mail-format.c:1357
 msgid "No GPG/PGP program configured."
 msgstr "GPG/PGP �ץ����������꤬����ޤ���"
 
-#: mail/mail-format.c:1327
+#: mail/mail-format.c:1373
 msgid "Encrypted message not displayed"
 msgstr "�Ź沽���줿��å�������ɽ�����ޤ���"
 
-#: mail/mail-format.c:1338
+#: mail/mail-format.c:1384
 msgid "Encrypted message"
 msgstr "�Ź沽���줿��å�����"
 
-#: mail/mail-format.c:1339
+#: mail/mail-format.c:1385
 msgid "Click icon to decrypt."
 msgstr "��������򥯥�å��������沽���Ƥ�������"
 
-#: mail/mail-format.c:1394
+#: mail/mail-format.c:1440
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "���Υ�å������ϥǥ������̾���쿮��Ǥ����ΤǤ�"
 
-#: mail/mail-format.c:1405
+#: mail/mail-format.c:1451
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "���Υ�å������ϥǥ������̾���줿��ΤǤ���, ������������ޤ���"
 
-#: mail/mail-format.c:2083
+#: mail/mail-format.c:2128
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP ������ (%s) ��ؤ��Ƥ��ޤ�"
 
-#: mail/mail-format.c:2097
+#: mail/mail-format.c:2142
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2102
+#: mail/mail-format.c:2147
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "��������ե����� (%s) ��ؤ��Ƥ��ޤ�"
 
-#: mail/mail-format.c:2131
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "��⡼�ȥǡ��� (%s) ��ؤ��Ƥ��ޤ�"
 
-#: mail/mail-format.c:2139
+#: mail/mail-format.c:2184
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "̤�Τγ����ǡ��� (\"%s\" ������) ��ؤ��Ƥ��ޤ�"
 
-#: mail/mail-format.c:2144
+#: mail/mail-format.c:2189
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:547
+#: mail/mail-local.c:563
 msgid "Reconfiguring folder"
 msgstr "�ե������ƹ�����"
 
-#: mail/mail-local.c:620
+#: mail/mail-local.c:636
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -9189,27 +9313,27 @@ msgstr ""
 "�ե�����Υ᥿�������¸����ޤ���; ��Ϥ䤳�Υե�����򳫤�\n"
 "���Ȥ�����ʤ��ȵ��Ť��Ǥ��礦: %s"
 
-#: mail/mail-local.c:676
+#: mail/mail-local.c:689
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "�ե�����Υ᥿����� %s ����¸�Ǥ��ޤ���: %s"
 
-#: mail/mail-local.c:722
+#: mail/mail-local.c:735
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "�ե�����Υ᥿�ǡ��� %s �������뤳�Ȥ�����ޤ���: %s"
 
-#: mail/mail-local.c:1052
+#: mail/mail-local.c:1075
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "�ե���� \"%s\" �� \"%s\" �������ѹ����Ƥ��ޤ�"
 
-#: mail/mail-local.c:1067
+#: mail/mail-local.c:1090
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1089
+#: mail/mail-local.c:1112
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -9217,16 +9341,16 @@ msgstr ""
 "�⤷���Υ᡼��ܥå����򳫤����ȤϤʤ��ʤ�\n"
 "��ư�Dz���������ɬ�פ����뤫�⤷��ޤ���"
 
-#: mail/mail-local.c:1180
+#: mail/mail-local.c:1200
 msgid "You cannot change the format of a non-local folder."
 msgstr "��������ե�����ʳ��η������ѹ��Ǥ��ޤ���"
 
-#: mail/mail-local.c:1190
-#, c-format
-msgid "Reconfigure %s"
+#: mail/mail-local.c:1209
+#, fuzzy, c-format
+msgid "Reconfigure /%s"
 msgstr "%s �����"
 
-#: mail/mail-mt.c:188
+#: mail/mail-mt.c:199
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -9235,7 +9359,7 @@ msgstr ""
 "'%s' �κݤ˥��顼��ȯ�����ޤ���:\n"
 "%s"
 
-#: mail/mail-mt.c:191
+#: mail/mail-mt.c:202
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -9245,20 +9369,24 @@ msgstr ""
 "%s"
 
 #. Remember the password?
-#: mail/mail-mt.c:454
+#: mail/mail-mt.c:509
 msgid "Remember this password"
 msgstr "���Υѥ���ɤ򵭲�"
 
-#: mail/mail-mt.c:511
+#: mail/mail-mt.c:510
+msgid "Remember this password for the remainder of this session"
+msgstr ""
+
+#: mail/mail-mt.c:567
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s �Τ���Υѥ���ɤ����Ϥ��Ƥ�������"
 
-#: mail/mail-mt.c:514
+#: mail/mail-mt.c:570
 msgid "Enter Password"
 msgstr "�ѥ���ɤ����Ϥ��Ƥ�������"
 
-#: mail/mail-mt.c:824
+#: mail/mail-mt.c:886
 msgid "Working"
 msgstr "�����"
 
@@ -9413,6 +9541,11 @@ msgstr "�ǡ�����񤭽Ф����Ȥ�����ޤ���Ǥ���: %s"
 msgid "Disconnecting from %s"
 msgstr "%s �Ȥ���³���ڤäƤ��ޤ�"
 
+#: mail/mail-ops.c:2065
+#, fuzzy, c-format
+msgid "Reconnecting to %s"
+msgstr "%s �Ȥ���³���ڤäƤ��ޤ�"
+
 #: mail/mail-search-dialogue.c:113
 msgid "_Search"
 msgstr "����(_S)"
@@ -9468,11 +9601,11 @@ msgstr ""
 msgid "Type: %s"
 msgstr "����: %s"
 
-#: mail/mail-send-recv.c:282
+#: mail/mail-send-recv.c:283
 msgid "Send & Receive Mail"
 msgstr "�᡼���������"
 
-#: mail/mail-send-recv.c:283
+#: mail/mail-send-recv.c:284
 msgid "Cancel All"
 msgstr "���٤ƥ���󥻥�"
 
@@ -9492,34 +9625,48 @@ msgstr "����󥻥뤷�ޤ���"
 msgid "User canceled operation."
 msgstr "�桼���ˤ�ä����򥭥�󥻥뤵��ޤ���"
 
-#: mail/mail-tools.c:173
+#: mail/mail-tools.c:133
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "�ƥ�ݥ�� mbox '%s' ������Ǥ��ޤ���Ǥ���: %s"
 
-#: mail/mail-tools.c:299
+#: mail/mail-tools.c:259
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "��å�������ž�����ޤ��� - %s"
 
-#: mail/mail-tools.c:303
+#: mail/mail-tools.c:263
 msgid "Forwarded message"
 msgstr "ž�����줿��å�����"
 
-#: mail/mail-tools.c:439
+#: mail/mail-tools.c:396
 msgid "Forwarded Message"
 msgstr "ž�����줿��å�����"
 
-#: mail/mail-vfolder.c:161
+#: mail/mail-vfolder.c:84
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "���ۥե�����������: %s"
 
-#: mail/mail-vfolder.c:435
+#: mail/mail-vfolder.c:201
+#, fuzzy, c-format
+msgid "Updating vfolders for uri: %s"
+msgstr "\"%s\" ����Υե������������"
+
+#: mail/mail-vfolder.c:414
+#, c-format
+msgid ""
+"The following vFolder(s):\n"
+"%sUsed the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+
+#: mail/mail-vfolder.c:636
 msgid "VFolders"
 msgstr "���ۥե����"
 
-#: mail/mail-vfolder.c:541
+#: mail/mail-vfolder.c:742
 msgid "New VFolder"
 msgstr "�������ۥե����"
 
@@ -9588,7 +9735,7 @@ msgstr "%p %l:%M (%a)"
 msgid "%b %d %Y"
 msgstr "%Yǯ %m�� %d��"
 
-#: mail/message-list.c:2331
+#: mail/message-list.c:2334
 msgid "Generating message list"
 msgstr "��å������ꥹ�Ȥ������"
 
@@ -9673,31 +9820,31 @@ msgstr "���ɲ��(_U)"
 msgid "Evolution component for the executive summary."
 msgstr "�¹ԥ��ޥ�Τ���� Evolution ����ݡ��ͥ��"
 
-#: my-evolution/component-factory.c:30
+#: my-evolution/component-factory.c:45
 msgid "Folder containing the Evolution Summary"
 msgstr "Evolution���ޥ꡼��ޤ�ե����"
 
-#: my-evolution/component-factory.c:139
+#: my-evolution/component-factory.c:154
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr "Evolution �¹ԥ��ޥ꡼����ݡ��ͥ�Ȥν����������ޤ���"
 
-#: my-evolution/e-summary-calendar.c:248 my-evolution/e-summary-calendar.c:266
+#: my-evolution/e-summary-calendar.c:263 my-evolution/e-summary-calendar.c:281
 msgid "Appointments"
 msgstr "���ݥ����"
 
-#: my-evolution/e-summary-calendar.c:249
+#: my-evolution/e-summary-calendar.c:264
 msgid "No appointments"
 msgstr "���ݥ���ȤϤ���ޤ���"
 
-#: my-evolution/e-summary-calendar.c:286
+#: my-evolution/e-summary-calendar.c:301
 msgid "%k%M %d %B"
 msgstr "%k%M %B%d��"
 
-#: my-evolution/e-summary-calendar.c:288
+#: my-evolution/e-summary-calendar.c:303
 msgid "%l:%M %d %B"
 msgstr "%B%d��%l��%Mʬ"
 
-#: my-evolution/e-summary-mail.c:115
+#: my-evolution/e-summary-mail.c:130
 msgid "Mail summary"
 msgstr "�᡼�륵�ޥ�"
 
@@ -9705,89 +9852,91 @@ msgstr "�᡼�륵�ޥ�"
 #. see in My Evolution by default. You can find the list of all
 #. stations and their codes in Evolution sources
 #. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-preferences.c:65
-#: my-evolution/e-summary-weather.c:615
+#: my-evolution/e-summary-preferences.c:80
+#: my-evolution/e-summary-weather.c:630
 msgid "KBOS:ZSAM:EGAA"
 msgstr "RJTT:RJAA:RJTA"
 
-#: my-evolution/e-summary-preferences.c:427
+#: my-evolution/e-summary-preferences.c:441
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com ����������"
 
-#: my-evolution/e-summary-preferences.c:449
+#: my-evolution/e-summary-preferences.c:463
 msgid "Quotes of the Day"
 msgstr "������"
 
-#: my-evolution/e-summary-preferences.c:890
+#: my-evolution/e-summary-preferences.c:929
 msgid "Add a news feed"
 msgstr "�˥塼���ۿ����ɲ�"
 
-#: my-evolution/e-summary-preferences.c:898
+#: my-evolution/e-summary-preferences.c:937
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "�ɲä������˥塼���ۿ��� URL ������"
 
-#: my-evolution/e-summary-preferences.c:902
+#: my-evolution/e-summary-preferences.c:941
 msgid "Name:"
 msgstr "̾��:"
 
-#: my-evolution/e-summary-preferences.c:1438
+#: my-evolution/e-summary-preferences.c:1486
 msgid "Summary Settings"
 msgstr "���ޥ������"
 
-#: my-evolution/e-summary-rdf.c:277 my-evolution/e-summary-rdf.c:362
-#: my-evolution/e-summary-rdf.c:395
+#: my-evolution/e-summary-rdf.c:297 my-evolution/e-summary-rdf.c:382
+#: my-evolution/e-summary-rdf.c:415
 msgid "Error downloading RDF"
 msgstr "RDF �Υ������������˥��顼"
 
-#: my-evolution/e-summary-rdf.c:487
+#: my-evolution/e-summary-rdf.c:507
 msgid "News Feed"
 msgstr "�˥塼���ե�����"
 
-#: my-evolution/e-summary-tasks.c:216
+#: my-evolution/e-summary-tasks.c:238
 msgid "No tasks"
 msgstr "�������Ϥ���ޤ���"
 
-#: my-evolution/e-summary-tasks.c:255
+#: my-evolution/e-summary-tasks.c:277
 msgid "(No Description)"
 msgstr "(�����ʤ�)"
 
-#: my-evolution/e-summary-weather.c:57
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr "��ŷ��"
 
-#: my-evolution/e-summary-weather.c:334
+#: my-evolution/e-summary-weather.c:349
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr "<dd><b>��ŷ�������С�����³�Ǥ��ޤ���Ǥ���</b></dd>"
 
-#: my-evolution/e-summary-weather.c:524
+#: my-evolution/e-summary-weather.c:539
 msgid "Weather"
 msgstr "��ŷ��"
 
-#: my-evolution/e-summary-weather.c:676
+#: my-evolution/e-summary-weather.c:691
 msgid "Regions"
 msgstr "�ϰ�"
 
-#: my-evolution/e-summary.c:162
+#: my-evolution/e-summary.c:187
 msgid "%A, %B %e %Y"
 msgstr "%Yǯ%B%e�� %A"
 
-#: my-evolution/e-summary.c:512 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:568 ui/my-evolution.xml.h:3
 msgid "Print Summary"
 msgstr "���ޥ�����"
 
-#: my-evolution/e-summary.c:558
+#: my-evolution/e-summary.c:614
 msgid "Printing of Summary failed"
 msgstr "���ޥ�ΰ����˼��Ԥ��ޤ���"
 
-#: my-evolution/main.c:52
+#: my-evolution/main.c:67
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "������������ݡ��ͥ�Ȥ� Bonobo �������Ǥ��ޤ���Ǥ���\n"
 
 #: my-evolution/metar.c:29
+#, fuzzy
 msgid "F"
 msgstr "�ڻ�"
 
 #: my-evolution/metar.c:29
+#, fuzzy
 msgid "C"
 msgstr "�ݻ�"
 
@@ -11181,37 +11330,38 @@ msgstr ""
 "�ǥ��쥯�ȥ�ǤϤ���ޤ���Evolution �桼��\n"
 "�ե�����Υ��󥹥ȡ������Ƥ��뤿��˰�ư���Ʋ�����"
 
-#: shell/e-shell-folder-commands.c:174
+#: shell/e-shell-folder-commands.c:176
 msgid "Cannot move a folder over itself."
 msgstr "�ե������Ʊ���ե�����ˤϰ�ư�Ǥ��ޤ���"
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:178
 msgid "Cannot copy a folder over itself."
 msgstr "�ե������Ʊ���ե�����ˤϥ��ԡ��Ǥ��ޤ���"
 
-#: shell/e-shell-folder-commands.c:190
+#: shell/e-shell-folder-commands.c:192
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:294
+#: shell/e-shell-folder-commands.c:312
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "�ե���� \"%s\" �򥳥ԡ�����ե��������ꤷ�ޤ�:"
 
-#: shell/e-shell-folder-commands.c:299
+#: shell/e-shell-folder-commands.c:317
 msgid "Copy folder"
 msgstr "�ե�����Υ��ԡ�"
 
-#: shell/e-shell-folder-commands.c:337
+#: shell/e-shell-folder-commands.c:359
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "�ե���� \"%s\" ���ư����ե��������ꤷ�ޤ�:"
 
-#: shell/e-shell-folder-commands.c:342
+#: shell/e-shell-folder-commands.c:364
 msgid "Move folder"
 msgstr "�ե�����ΰ�ư"
 
-#: shell/e-shell-folder-commands.c:367
+#: shell/e-shell-folder-commands.c:390
+#, c-format
 msgid ""
 "Cannot delete folder:\n"
 "%s"
@@ -11219,32 +11369,35 @@ msgstr ""
 "�ե���������Ǥ��ޤ���:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:383
-#, c-format
-msgid "Delete folder '%s'"
-msgstr "�ե�����������ޤ� '%s'"
+#: shell/e-shell-folder-commands.c:406
+#, fuzzy, c-format
+msgid "Delete \"%s\""
+msgstr "���"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:393
-msgid "Are you sure you want to remove the '%s' folder?"
+#: shell/e-shell-folder-commands.c:416
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the \"%s\" folder?"
 msgstr "�����˥ե���� '%s' �������Ƥ��������Ǥ���?"
 
-#. Popup a dialog asking what the user would like to rename
-#. the folder to
-#: shell/e-shell-folder-commands.c:468
-#, c-format
-msgid "Rename folder '%s'"
-msgstr "�ե���� '%s' ���͡���"
+#: shell/e-shell-folder-commands.c:470
+#, fuzzy, c-format
+msgid ""
+"Cannot rename folder:\n"
+"%s"
+msgstr ""
+"�ե���������Ǥ��ޤ���:\n"
+"%s"
 
-#: shell/e-shell-folder-commands.c:472
-msgid "Rename"
-msgstr "��͡���"
+#: shell/e-shell-folder-commands.c:503
+#, fuzzy, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "�ե���� '%s' ���͡���"
 
-#. Make, pack the label
-#: shell/e-shell-folder-commands.c:480
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "�ե����̾:"
+#: shell/e-shell-folder-commands.c:506
+#, fuzzy
+msgid "Rename folder"
+msgstr "�ե���� '%s' ���͡���"
 
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
@@ -11280,7 +11433,7 @@ msgstr "���ꤵ�줿�ե����̾��ͭ���ǤϤ���ޤ���: %s"
 msgid "Evolution - Create new folder"
 msgstr "Evolution - �����ե�����κ���"
 
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:99
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -11288,7 +11441,7 @@ msgstr ""
 "���򤷤��ե�����μ��̤��׵ᤵ�줿���Τ����\n"
 "ͭ���ǤϤ���ޤ���"
 
-#: shell/e-shell-folder-selection-dialog.c:348
+#: shell/e-shell-folder-selection-dialog.c:360
 msgid "New..."
 msgstr "����..."
 
@@ -11296,7 +11449,11 @@ msgstr "����..."
 msgid "(Untitled)"
 msgstr "(�����ȥ�ʤ�)"
 
-#: shell/e-shell-importer.c:102
+#: shell/e-shell-importer.c:141
+msgid "Choose the type of importer to run"
+msgstr ""
+
+#: shell/e-shell-importer.c:144
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -11310,9 +11467,13 @@ msgstr ""
 "�⤷ʬ����ʤ��ʤ� \"��Ư\" �����򤹤뤳�Ȥ����衤Evolution �ϲ����ߤ��"
 "���礦"
 
+#: shell/e-shell-importer.c:150
+msgid "Please select the information that you would like to import"
+msgstr ""
+
 #. Importer isn't ready yet.
 #. Wait 5 seconds and try again.
-#: shell/e-shell-importer.c:197
+#: shell/e-shell-importer.c:242
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11323,7 +11484,7 @@ msgstr ""
 "����ݡ����ν���������Ƥ��ޤ���\n"
 "5���Ԥäƺ��ٻ�Ƥ�������"
 
-#: shell/e-shell-importer.c:217 shell/e-shell-importer.c:248
+#: shell/e-shell-importer.c:262 shell/e-shell-importer.c:293
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11332,16 +11493,16 @@ msgstr ""
 "%s �򥤥�ݡ�����\n"
 "�����ƥ� %d �򥤥�ݡ�����"
 
-#: shell/e-shell-importer.c:351
+#: shell/e-shell-importer.c:396
 #, c-format
 msgid "File %s does not exist"
 msgstr "�ե���� %s ��¸�ߤ��ޤ���"
 
-#: shell/e-shell-importer.c:363
+#: shell/e-shell-importer.c:408
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:378
+#: shell/e-shell-importer.c:423
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -11350,11 +11511,11 @@ msgstr ""
 "�������Ȥ�����륤��ݡ��Ȥ�����ޤ���\n"
 "%s"
 
-#: shell/e-shell-importer.c:388
+#: shell/e-shell-importer.c:433
 msgid "Importing"
 msgstr "����ݡ�����"
 
-#: shell/e-shell-importer.c:396
+#: shell/e-shell-importer.c:441
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -11363,17 +11524,17 @@ msgstr ""
 "%s �򥤥�ݡ�����\n"
 "%s �򳫻Ϥ��ޤ�"
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:454
 #, c-format
 msgid "Error starting %s"
 msgstr "%s �γ�����˥��顼��ȯ�����ޤ���"
 
-#: shell/e-shell-importer.c:428
+#: shell/e-shell-importer.c:473
 #, c-format
 msgid "Error loading %s"
 msgstr "%s �Υ�������˥��顼��ȯ�����ޤ���"
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:490
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11382,31 +11543,55 @@ msgstr ""
 "%s �򥤥�ݡ�����\n"
 "�����ƥ� 1 �򥤥�ݡ�����"
 
-#: shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:560
 msgid "Automatic"
 msgstr "��Ư"
 
-#: shell/e-shell-importer.c:566
+#: shell/e-shell-importer.c:611
 msgid "Filename:"
 msgstr "�ե�����̾:"
 
-#: shell/e-shell-importer.c:571
+#: shell/e-shell-importer.c:616
 msgid "Select a file"
 msgstr "�ե����������"
 
-#: shell/e-shell-importer.c:581
+#: shell/e-shell-importer.c:626
 msgid "File type:"
 msgstr "�ե��������:"
 
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:651
+msgid "Import data and settings from older programs"
+msgstr ""
+
+#: shell/e-shell-importer.c:655
+#, fuzzy
+msgid "Import a single file"
+msgstr "�����ե���������򥤥�ݡ��Ȥ��ޤ�"
+
+#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:582
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:585
+msgid "Starting Intelligent Importers"
+msgstr ""
+
+#: shell/e-shell-importer.c:840 shell/e-shell-startup-wizard.c:703
+#, c-format
+msgid "From %s:"
+msgstr "%s ����:"
+
+#: shell/e-shell-importer.c:1003
 msgid "Select folder"
 msgstr "�ե����������"
 
-#: shell/e-shell-importer.c:646
+#: shell/e-shell-importer.c:1004
 msgid "Select a destination folder for importing this data"
 msgstr "���Υǡ����򥤥�ݡ��Ȥ���������Υե���������򤷤Ƥ�������"
 
-#: shell/e-shell-importer.c:689 shell/importer/intelligent.c:194
+#: shell/e-shell-importer.c:1116 shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "����ݡ���"
 
@@ -11425,44 +11610,29 @@ msgstr ""
 msgid "Cannot initialize the Evolution Mailer Wizard interface"
 msgstr "Evolution �᡼�륦�������ɥ��󥿡��ե������ν����������ޤ���"
 
-#: shell/e-shell-startup-wizard.c:582
-msgid ""
-"Please wait...\n"
-"Scanning for existing setups"
-msgstr ""
-
-#: shell/e-shell-startup-wizard.c:585
-msgid "Starting Intelligent Importers"
-msgstr ""
-
-#: shell/e-shell-startup-wizard.c:703
-#, c-format
-msgid "From %s:"
-msgstr "%s ����:"
-
 #: shell/e-shell-startup-wizard.c:745
 msgid ""
 "Please select the information\n"
 "that you would like to import"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:183
+#: shell/e-shell-view-menu.c:201
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy �Ϥ��ʤ��� $PATH �ˤϸ��Ĥ���ޤ���"
 
-#: shell/e-shell-view-menu.c:191
+#: shell/e-shell-view-menu.c:209
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy �ϼ¹ԤǤ��ޤ���Ǥ���"
 
-#: shell/e-shell-view-menu.c:217
+#: shell/e-shell-view-menu.c:235
 msgid "Ximian Evolution"
 msgstr "Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:219
+#: shell/e-shell-view-menu.c:237
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:221
+#: shell/e-shell-view-menu.c:239
 msgid ""
 "Ximian Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -11473,27 +11643,36 @@ msgstr ""
 "Ϣ����ޥ͡������ȤΤ����\n"
 "���롼�ץ��������ץꥱ�������Ǥ�"
 
-#: shell/e-shell-view-menu.c:424
+#: shell/e-shell-view-menu.c:442
 msgid "Go to folder..."
 msgstr "�ե�����ذ�ư..."
 
-#: shell/e-shell-view-menu.c:425
+#: shell/e-shell-view-menu.c:443
 msgid "Select the folder that you want to open"
 msgstr "���������ե���������򤷤ޤ�"
 
-#: shell/e-shell-view-menu.c:570
+#: shell/e-shell-view-menu.c:563
 msgid "Create a new shortcut"
 msgstr "�������硼�ȥ��åȤ�������ޤ�"
 
-#: shell/e-shell-view-menu.c:571
+#: shell/e-shell-view-menu.c:564
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "���硼�ȥ��åȤˤ������ե���������򤷤ޤ�:"
 
-#: shell/e-shell-view-menu.c:685
+#: shell/e-shell-view-menu.c:595
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:603
+#, fuzzy, c-format
+msgid "Error executing %s."
+msgstr "�ե��륿�¹���˥��顼: %s: %s"
+
+#: shell/e-shell-view-menu.c:705
 msgid "Work Online"
 msgstr "����饤����"
 
-#: shell/e-shell-view-menu.c:698 shell/e-shell-view-menu.c:711
+#: shell/e-shell-view-menu.c:718 shell/e-shell-view-menu.c:731
 #: ui/evolution.xml.h:30
 msgid "Work Offline"
 msgstr "���ե饤����"
@@ -11502,45 +11681,49 @@ msgstr "���ե饤����"
 msgid "(No folder displayed)"
 msgstr "(ɽ�������ե�����Ϥ���ޤ���)"
 
-#: shell/e-shell-view.c:1478
+#: shell/e-shell-view.c:1512
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1480
+#: shell/e-shell-view.c:1514
 msgid "(None)"
 msgstr "(�ʤ�)"
 
-#: shell/e-shell-view.c:1485
+#: shell/e-shell-view.c:1519
 #, c-format
 msgid "%s - Ximian Evolution %s"
 msgstr "%s - Ximian Evolution - %s"
 
-#: shell/e-shell-view.c:1487
+#: shell/e-shell-view.c:1521
 #, c-format
 msgid "%s - Ximian Evolution %s [%s]"
 msgstr "%s - Ximian Evolution %s [%s]"
 
-#: shell/e-shell-view.c:1527
+#: shell/e-shell-view.c:1561
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr "Ximian Evolution �ϸ��ߥ���饤��Ǥ������ե饤��ˤ���ˤϤ��Υܥ���򥯥�å����Ƥ�������"
+msgstr ""
+"Ximian Evolution �ϸ��ߥ���饤��Ǥ������ե饤��ˤ���ˤϤ��Υܥ���򥯥��"
+"�����Ƥ�������"
 
-#: shell/e-shell-view.c:1534
+#: shell/e-shell-view.c:1568
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution �ϥ��ե饤�������Ǥ�"
 
-#: shell/e-shell-view.c:1540
+#: shell/e-shell-view.c:1574
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr "Ximian Evolution �ϸ��ߥ��ե饤��Ǥ�������饤��ˤ���ˤϤ��Υܥ���򥯥�å����Ƥ�������"
+msgstr ""
+"Ximian Evolution �ϸ��ߥ��ե饤��Ǥ�������饤��ˤ���ˤϤ��Υܥ���򥯥��"
+"�����Ƥ�������"
 
-#: shell/e-shell.c:560
+#: shell/e-shell.c:562
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "�����������֤Υ��åȥ��åפ�����ޤ��� -- %s"
 
-#: shell/e-shell.c:1496
+#: shell/e-shell.c:1488
 #, c-format
 msgid ""
 "Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
@@ -11549,23 +11732,23 @@ msgstr ""
 "���ä�! `%s' �Υӥ塼��������˴���ޤ��� :-(\n"
 "����Ϥ��֤� %s ����ݡ��ͥ�Ȥ�����å��夷�����Ȥ��̣���ޤ�"
 
-#: shell/e-shell.c:1700 widgets/misc/e-cell-date-edit.c:248
+#: shell/e-shell.c:1692 widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "OK"
 
-#: shell/e-shell.c:1702
+#: shell/e-shell.c:1694
 msgid "Invalid arguments"
 msgstr "�����ʰ����Ǥ�"
 
-#: shell/e-shell.c:1704
+#: shell/e-shell.c:1696
 msgid "Cannot register on OAF"
 msgstr "OAF ����Ͽ����ޤ���"
 
-#: shell/e-shell.c:1706
+#: shell/e-shell.c:1698
 msgid "Configuration Database not found"
 msgstr "����ե����졼�����ǡ����١������ߤĤ���ޤ���"
 
-#: shell/e-shell.c:1708 shell/e-storage.c:491
+#: shell/e-shell.c:1700 shell/e-storage.c:496
 msgid "Generic error"
 msgstr "����Ū�ʥ��顼"
 
@@ -11690,51 +11873,60 @@ msgstr "���硼�ȥ��åȤ���¸��˥��顼��ȯ�����ޤ���"
 msgid "Shortcuts"
 msgstr "���硼�ȥ��å�"
 
+#: shell/e-storage-set-view.c:645
+#, fuzzy, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr ""
+"�ե���������Ǥ��ޤ���:\n"
+"%s"
+
 #: shell/e-storage.c:182 shell/e-storage.c:188
 msgid "(No name)"
 msgstr "(̾���ʤ�)"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:494
 msgid "No error"
 msgstr "���顼�Ϥ���ޤ���"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:498
 msgid "A folder with the same name already exists"
 msgstr "Ʊ��̾���Υե���������Ǥ�¸�ߤ��Ƥ��ޤ�"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:500
 msgid "The specified folder type is not valid"
 msgstr "���ꤵ�줿�ե�������̤�ͭ���ǤϤ���ޤ���"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:502
 msgid "I/O error"
 msgstr "I/O ���顼"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:504
 msgid "Not enough space to create the folder"
 msgstr "�ե������������뽽ʬ�ʶ���������ޤ���"
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:506
 msgid "The specified folder was not found"
 msgstr "���ꤵ�줿�ե�����ϸ��դ���ޤ���Ǥ���"
 
-#: shell/e-storage.c:503
+#: shell/e-storage.c:508
 msgid "Function not implemented in this storage"
 msgstr "��ǽ�Ϥ��ε������֤Ǥϼ�������Ƥ��ޤ���"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:512
 msgid "Operation not supported"
 msgstr "���ϥ��ݡ��Ȥ���Ƥ��ޤ���"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:514
 msgid "The specified type is not supported in this storage"
 msgstr "���ꤵ�줿���̤Ϥ��ε������֤Ǥϥ��ݡ��Ȥ���Ƥ��ޤ���"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:516
 msgid "The specified folder cannot be modified or removed"
 msgstr "���ꤵ�줿�ե�������ѹ�������Ǥ��ޤ���Ǥ���"
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:518
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
@@ -11764,6 +11956,10 @@ msgstr "�ۥ���"
 msgid "The following connections are currently active:"
 msgstr ""
 
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr "�ե����̾:"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder type:"
 msgstr "�ե��������:"
@@ -11817,14 +12013,26 @@ msgid "Evolution Importer Assistant"
 msgstr "Evolution ����ݡ��ȥ����������"
 
 #: shell/importer/import.glade.h:4
-msgid "Import File (Step 2 of 2)"
+#, fuzzy
+msgid "Import File (step 3 of 3)"
 msgstr "�ե�����򥤥�ݡ��� (���ƥå� 2/2)"
 
 #: shell/importer/import.glade.h:5
-msgid "Select a File (step 1 of 2)"
-msgstr "�ե���������� (���ƥå� 1/2)"
+#, fuzzy
+msgid "Importer Type (step 1 of 3)"
+msgstr "�ե�����򥤥�ݡ��� (���ƥå� 2/2)"
 
 #: shell/importer/import.glade.h:6
+#, fuzzy
+msgid "Select Importers (step 2 of 3)"
+msgstr "�ե���������� (���ƥå� 1/2)"
+
+#: shell/importer/import.glade.h:7
+#, fuzzy
+msgid "Select a File (step 2 of 3)"
+msgstr "�ե���������� (���ƥå� 1/2)"
+
+#: shell/importer/import.glade.h:8
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of\n"
@@ -12037,13 +12245,6 @@ msgstr "Ϣ����θ���(_S)"
 msgid "_Select All"
 msgstr "���٤�����(_A)"
 
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:44
-#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
-#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:19
-#: ui/my-evolution.xml.h:9
-msgid "_Tools"
-msgstr "�ġ���(_T)"
-
 #: ui/evolution-calendar.xml.h:2
 msgid "Configure the calendar's settings"
 msgstr "��������������ѹ����ޤ�"
@@ -12214,8 +12415,8 @@ 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:49
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:36
 msgid "_File"
 msgstr "�ե�����(_F)"
@@ -12236,8 +12437,8 @@ msgstr "Ϣ�������¸���Ƥ��Υ����������ܥå������Ĥ��ޤ�"
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:54
-#: ui/evolution-signature-editor.xml.h:11
+#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Save"
 msgstr "��¸(_S)"
 
@@ -12826,6 +13027,11 @@ msgstr "�̾�ɽ��(_N)"
 msgid "_Open Message"
 msgstr "��å������򳫤�(_O)"
 
+#: ui/evolution-mail-message.xml.h:98 ui/evolution.xml.h:49
+#: ui/my-evolution.xml.h:9
+msgid "_Tools"
+msgstr "�ġ���(_T)"
+
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "���Υ�����ɥ����Ĥ��ޤ�"
@@ -12837,8 +13043,8 @@ msgstr "���Υ�����ɥ����Ĥ��ޤ�"
 msgid "_Close"
 msgstr "�Ĥ���(_C)"
 
-#: ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:48
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:50
 msgid "_View"
 msgstr "ɽ��(_V)"
 
@@ -13000,36 +13206,31 @@ msgid "_Cc Field"
 msgstr "Cc �ե������(_C)"
 
 #: ui/evolution-message-composer.xml.h:46
-#: ui/evolution-signature-editor.xml.h:6
-msgid "_Debug"
-msgstr "�ǥХå�(_D)"
-
-#: ui/evolution-message-composer.xml.h:47
 msgid "_Delete all"
 msgstr "���٤ƺ��(_D)"
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:49
 msgid "_From Field"
 msgstr "���пͥե������(_F)"
 
-#: ui/evolution-message-composer.xml.h:51
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-signature-editor.xml.h:9
 msgid "_Insert"
 msgstr "����(_I)"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:51
 msgid "_Open..."
 msgstr "����(_O)..."
 
-#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Reply-To Field"
 msgstr "�ֿ���ե������(_R)"
 
-#: ui/evolution-message-composer.xml.h:55
+#: ui/evolution-message-composer.xml.h:54
 msgid "_Security"
 msgstr "�������ƥ�(_S)"
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "�إ��(_H)"
 
@@ -13162,8 +13363,8 @@ msgid "Exit the program"
 msgstr "�ץ�������λ���ޤ�"
 
 #: ui/evolution.xml.h:15
-msgid "Import an external file format"
-msgstr "�����ե���������򥤥�ݡ��Ȥ��ޤ�"
+msgid "Import data from other programs"
+msgstr ""
 
 #: ui/evolution.xml.h:17
 msgid "Move this folder to another place"
@@ -13234,8 +13435,9 @@ msgid "_Go to Folder..."
 msgstr "�ե�����ذ�ư(_G)..."
 
 #: ui/evolution.xml.h:41
-msgid "_Import File..."
-msgstr "�ե�����򥤥�ݡ���(_I)..."
+#, fuzzy
+msgid "_Import..."
+msgstr "����ݡ�����..."
 
 #: ui/evolution.xml.h:42
 msgid "_Move..."
@@ -13250,18 +13452,23 @@ msgid "_New Folder"
 msgstr "�����ե����(_N)"
 
 #: ui/evolution.xml.h:45
+#, fuzzy
+msgid "_Pilot Settings..."
+msgstr "�᡼������(_M)..."
+
+#: ui/evolution.xml.h:46
 msgid "_Rename..."
 msgstr "��͡���(_R)..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:47
 msgid "_Shortcut"
 msgstr "���硼�ȥ��å�(_S)"
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:48
 msgid "_Shortcut Bar"
 msgstr "���硼�ȥ��åȥС�(_S)"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:51
 msgid "_Work Offline"
 msgstr "���ե饤����(_W)"
 
@@ -13335,8 +13542,8 @@ msgid ""
 "zone.\n"
 " Use the right mouse button to zoom out."
 msgstr ""
-"�ޥ����κ��ܥ����Ȥä��ϿޤΥ��ꥢ����礷�ƥ����ॾ��������򤷤�"
-"����������\n"
+"�ޥ����κ��ܥ����Ȥä��ϿޤΥ��ꥢ����礷�ƥ����ॾ��������򤷤Ƥ�����"
+"����\n"
 "�ޥ����α��ܥ���ǽ̾����ޤ���"
 
 #: widgets/menus/gal-view-menus.c:218
@@ -13358,11 +13565,11 @@ msgstr "MTWTFSS"
 msgid "%B %Y"
 msgstr "%Y %B"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:433
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:439
 msgid "Now"
 msgstr "��"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:445
 msgid "Today"
 msgstr "����"
 
@@ -13428,6 +13635,7 @@ msgid "New"
 msgstr "�˥塼��"
 
 #: widgets/misc/e-charset-picker.c:160
+#, c-format
 msgid "Unknown character set: %s"
 msgstr "������ʸ�������ɥ��å�: %s"
 
@@ -13505,21 +13713,61 @@ msgstr "�ѡ����ʥ륢�ɥ쥹Ģ������"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "�ѡ����ʥ륫����������; �������ե����ȥ�"
 
-#: wombat/wombat.c:175
+#: wombat/wombat.c:176
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): GNOME-VFS���������뤳�Ȥ�����ޤ���Ǥ���"
 
-#: wombat/wombat.c:187
+#: wombat/wombat.c:188
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): GNOME ���������뤳�Ȥ�����ޤ���Ǥ���"
 
-#: wombat/wombat.c:200
+#: wombat/wombat.c:201
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
 
-#, fuzzy
-#~ msgid "Cannot open folder: %s: No such folder"
-#~ msgstr "�ե�������������ޤ���: %s: %s"
+#~ msgid "_Calendar Information:"
+#~ msgstr "����������(_C):"
+
+#~ msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
+#~ msgstr ""
+#~ "ͥ���٤� '�⤤', '����', '�㤤' ���뤤�� '̤���' �����򤷤ʤ���Фʤ�ޤ�"
+#~ "��"
+
+#~ msgid "before start of appointment"
+#~ msgstr "���ݥ���Ȥγ�����"
+
+#~ msgid "after start of appointment"
+#~ msgstr "���ݥ���Ȥγ��ϸ�"
+
+#~ msgid "before end of appointment"
+#~ msgstr "���ݥ���Ȥν�λ��"
+
+#~ msgid "Evolution Shortcuts"
+#~ msgstr "Evolution ���硼�ȥ��å�"
+
+#~ msgid "Each account must have a different name."
+#~ msgstr "���줾�쥢������Ȥϰۤʤ�̾���Ǥʤ��ƤϤʤ�ޤ���"
+
+#~ msgid "Message _preview should be displayed by default"
+#~ msgstr "��å������ץ�ӥ塼��ǥե���Ȥ�ɽ������(_P)"
+
+#~ msgid "Message list should display in a _threaded fashion by default"
+#~ msgstr "��å������ꥹ�Ȥ�ǥե���Ȥǥ���åɲ�����(_T)"
+
+#~ msgid "_Remember PGP Passphrase until exit"
+#~ msgstr "��λ����ޤ� PGP �ѥ��ե졼���򵭲�����(_R)"
+
+#~ msgid "Delete folder '%s'"
+#~ msgstr "�ե�����������ޤ� '%s'"
+
+#~ msgid "Rename"
+#~ msgstr "��͡���"
+
+#~ msgid "_Debug"
+#~ msgstr "�ǥХå�(_D)"
+
+#~ msgid "_Import File..."
+#~ msgstr "�ե�����򥤥�ݡ���(_I)..."
 
 #~ msgid "Unable to get local storage.  This should never happen."
 #~ msgstr "�������륹�ȥ졼��������Ǥ��ޤ��󡣵����ƤϤʤ�ʤ����ȤǤ���"
diff --git a/po/ko.po b/po/ko.po
index 531e753a62..b50b924b99 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: 2001-09-21 18:31-0400\n"
+"POT-Creation-Date: 2001-10-01 19: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"
@@ -37,293 +37,293 @@ msgid "Name"
 msgstr "�̸�"
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#, fuzzy
-msgid "Family Name"
-msgstr "���� �̸�"
-
-#: addressbook/backend/ebook/e-card-simple.c:61
 #: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Email"
 msgstr "�̸���"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:61
 #: addressbook/gui/contact-editor/e-contact-editor.c:1609
 msgid "Primary"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:61
 #, fuzzy
 msgid "Prim"
 msgstr "�μ�"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:92
 #: addressbook/gui/contact-editor/e-contact-editor.c:1594
 #: addressbook/gui/widgets/e-addressbook-view.c:902
 msgid "Assistant"
 msgstr "����"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/gui/contact-editor/e-contact-editor.c:1595
 #: addressbook/gui/contact-editor/e-contact-editor.c:1662
 msgid "Business"
 msgstr "����"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/backend/ebook/e-card-simple.c:68
 #, fuzzy
 msgid "Bus"
 msgstr "�ٻ�"
 
-#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/gui/contact-editor/e-contact-editor.c:1598
 msgid "Callback"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/gui/contact-editor/e-contact-editor.c:1600
 msgid "Company"
 msgstr "ȸ��"
 
-#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:65
 #, fuzzy
 msgid "Comp"
 msgstr "����"
 
-#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:69
 #: addressbook/gui/contact-editor/e-contact-editor.c:1601
 #: addressbook/gui/contact-editor/e-contact-editor.c:1663
 msgid "Home"
 msgstr "��"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:67
 #: addressbook/gui/widgets/e-addressbook-view.c:877
 msgid "Organization"
 msgstr "����"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:67
 #, fuzzy
 msgid "Org"
 msgstr ""
 "\n"
 "���: "
 
-#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/e-contact-editor.c:1605
 msgid "Mobile"
 msgstr "�޴���ȭ"
 
-#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/e-contact-editor.c:1599
 msgid "Car"
 msgstr "�ڵ���"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/e-contact-editor.c:1597
 #: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "Business Fax"
 msgstr "���� �ѽ�"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/backend/ebook/e-card-simple.c:72
 #, fuzzy
 msgid "Bus Fax"
 msgstr "���� �ѽ�"
 
-#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/backend/ebook/e-card-simple.c:73
 #: addressbook/gui/contact-editor/e-contact-editor.c:1603
 #: addressbook/gui/widgets/e-addressbook-view.c:883
 msgid "Home Fax"
 msgstr "�� �ѽ�"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/e-contact-editor.c:1596
 msgid "Business 2"
 msgstr "���� 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/backend/ebook/e-card-simple.c:74
 #, fuzzy
 msgid "Bus 2"
 msgstr "�ٻ�"
 
-#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/backend/ebook/e-card-simple.c:75
 #: addressbook/gui/contact-editor/e-contact-editor.c:1602
 msgid "Home 2"
 msgstr "�� 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/backend/ebook/e-card-simple.c:76
 #: addressbook/gui/contact-editor/e-contact-editor.c:1604
 #: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "ISDN"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/backend/ebook/e-card-simple.c:83
 #: addressbook/gui/contact-editor/e-contact-editor.c:1606
 #: addressbook/gui/contact-editor/e-contact-editor.c:1664
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:52
 msgid "Other"
 msgstr "��Ÿ"
 
-#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/backend/ebook/e-card-simple.c:78
 #: addressbook/gui/contact-editor/e-contact-editor.c:1607
 #: addressbook/gui/widgets/e-addressbook-view.c:888
 msgid "Other Fax"
 msgstr "��Ÿ �ѽ�"
 
-#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/gui/contact-editor/e-contact-editor.c:1608
 #: addressbook/gui/widgets/e-addressbook-view.c:889
 msgid "Pager"
 msgstr "�߻�"
 
-#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/backend/ebook/e-card-simple.c:80
 #: addressbook/gui/contact-editor/e-contact-editor.c:1610
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 msgid "Radio"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/backend/ebook/e-card-simple.c:81
 #: addressbook/gui/contact-editor/e-contact-editor.c:1611
 #: addressbook/gui/widgets/e-addressbook-view.c:891
 msgid "Telex"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/backend/ebook/e-card-simple.c:82
 #: addressbook/gui/widgets/e-addressbook-view.c:892
 msgid "TTY"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/backend/ebook/e-card-simple.c:84
 #: addressbook/gui/component/e-address-popup.c:476
 #: addressbook/gui/contact-editor/e-contact-editor.c:1637
 #: addressbook/gui/widgets/e-addressbook-view.c:894
 msgid "Email 2"
 msgstr "�̸��� 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/backend/ebook/e-card-simple.c:85
 #: addressbook/gui/component/e-address-popup.c:486
 #: addressbook/gui/contact-editor/e-contact-editor.c:1638
 #: addressbook/gui/widgets/e-addressbook-view.c:895
 msgid "Email 3"
 msgstr "�̸��� 3"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/widgets/e-addressbook-view.c:896
 msgid "Web Site"
 msgstr "�� ����Ʈ"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:86
 msgid "Url"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/widgets/e-addressbook-view.c:897
 msgid "Department"
 msgstr "�μ�"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:87
 msgid "Dep"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/backend/ebook/e-card-simple.c:88
 #: addressbook/gui/widgets/e-addressbook-view.c:898
 msgid "Office"
 msgstr "�繫��"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/backend/ebook/e-card-simple.c:88
 #, fuzzy
 msgid "Off"
 msgstr "�繫��"
 
-#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card-simple.c:89
 #: addressbook/gui/widgets/e-addressbook-view.c:899
 msgid "Title"
 msgstr "����"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:90
 #: addressbook/gui/widgets/e-addressbook-view.c:900
 msgid "Profession"
 msgstr "����"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Prof"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:91
 #: addressbook/gui/widgets/e-addressbook-view.c:901
 msgid "Manager"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:91
 #, fuzzy
 msgid "Man"
 msgstr "����"
 
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:92
 msgid "Ass"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card-simple.c:93
 #: addressbook/gui/widgets/e-addressbook-view.c:903
 msgid "Nickname"
 msgstr "����"
 
-#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card-simple.c:93
 #, fuzzy
 msgid "Nick"
 msgstr "����"
 
-#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/backend/ebook/e-card-simple.c:94
 #: addressbook/gui/widgets/e-addressbook-view.c:904
 msgid "Spouse"
 msgstr "�����"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card-simple.c:95
 #: addressbook/gui/widgets/e-addressbook-view.c:905
 msgid "Note"
 msgstr "��Ʈ"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:96
 #, fuzzy
 msgid "Calendar URI"
 msgstr "�޷�"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:96
 msgid "CALUri"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:97
 #: addressbook/gui/widgets/e-addressbook-view.c:906
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:97
 msgid "FBUrl"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:98
 #, fuzzy
 msgid "Anniversary"
 msgstr "�����(_v):"
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "Anniv"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card-simple.c:99
 #, fuzzy
 msgid "Birth Date"
 msgstr ""
 "\n"
 "����: "
 
-#: addressbook/backend/ebook/e-card-simple.c:103
+#: addressbook/backend/ebook/e-card-simple.c:102
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "���"
 
+#: addressbook/backend/ebook/e-card-simple.c:103
+#, fuzzy
+msgid "Family Name"
+msgstr "���� �̸�"
+
 #: addressbook/backend/ebook/e-card.c:3564
 msgid "Card: "
 msgstr "ī��: "
@@ -593,10 +593,10 @@ msgstr ""
 #: 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:1119
+#: addressbook/conduit/address-conduit.c:1167
 #: addressbook/gui/component/addressbook-factory.c:48
-#: calendar/conduits/calendar/calendar-conduit.c:1204
-#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/conduits/calendar/calendar-conduit.c:1262
+#: calendar/conduits/todo/todo-conduit.c:1034
 #: calendar/gui/alarm-notify/notify-main.c:78 calendar/gui/main.c:63
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo�� �ʱ�ȭ �Ҽ� �����ϴ�"
@@ -662,20 +662,20 @@ msgstr ""
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:681
-#: calendar/conduits/calendar/calendar-conduit.c:778
-#: calendar/conduits/todo/todo-conduit.c:592
+#: addressbook/conduit/address-conduit.c:731
+#: calendar/conduits/calendar/calendar-conduit.c:837
+#: calendar/conduits/todo/todo-conduit.c:609
 msgid "Could not start wombat server"
 msgstr "wombat ������ ������ ���� �����ϴ�"
 
-#: addressbook/conduit/address-conduit.c:682
-#: calendar/conduits/calendar/calendar-conduit.c:779
-#: calendar/conduits/todo/todo-conduit.c:593
+#: addressbook/conduit/address-conduit.c:732
+#: calendar/conduits/calendar/calendar-conduit.c:838
+#: calendar/conduits/todo/todo-conduit.c:610
 msgid "Could not start wombat"
 msgstr "wombat�� �����Ҽ� �����ϴ�"
 
-#: addressbook/conduit/address-conduit.c:714
-#: addressbook/conduit/address-conduit.c:717
+#: addressbook/conduit/address-conduit.c:762
+#: addressbook/conduit/address-conduit.c:765
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -721,8 +721,8 @@ msgid "Factory for the sample Addressbook control"
 msgstr "�ּҷ�"
 
 #: addressbook/gui/component/addressbook-component.c:66
-#: calendar/gui/dialogs/comp-editor-util.c:281
-#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:173
+#: calendar/gui/dialogs/comp-editor-util.c:289
+#: calendar/gui/dialogs/comp-editor-util.c:345 shell/e-local-storage.c:173
 #: shell/e-shortcuts.c:1062
 #, fuzzy
 msgid "Contacts"
@@ -741,23 +741,23 @@ msgstr "LDAP ����"
 msgid "LDAP server containing contact information"
 msgstr "IMAP ������ �亯�� %s ������ ��������ʽ��ϴ�"
 
-#: addressbook/gui/component/addressbook-component.c:386
+#: addressbook/gui/component/addressbook-component.c:411
 #: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "New Contact"
 msgstr "�� ����ó"
 
-#: addressbook/gui/component/addressbook-component.c:386
+#: addressbook/gui/component/addressbook-component.c:411
 #, fuzzy
 msgid "New _Contact"
 msgstr "�� ����ó"
 
-#: addressbook/gui/component/addressbook-component.c:387
+#: addressbook/gui/component/addressbook-component.c:412
 #, fuzzy
 msgid "New Contact List"
 msgstr "�� ����ó"
 
-#: addressbook/gui/component/addressbook-component.c:387
+#: addressbook/gui/component/addressbook-component.c:412
 #, fuzzy
 msgid "New Contact _List"
 msgstr "�� ����ó"
@@ -865,19 +865,19 @@ msgid "_Account name:"
 msgstr "���� ����"
 
 #: addressbook/gui/component/addressbook-config.glade.h:22
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: 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:90 my-evolution/my-evolution.glade.h:20
+#: mail/mail-config.glade.h:91 my-evolution/my-evolution.glade.h:20
 msgid "_Add"
 msgstr "�߰�(_A)"
 
 #: addressbook/gui/component/addressbook-config.glade.h:23
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:95
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:96
 #: ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
 #: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
 msgstr "����(_E)"
@@ -901,36 +901,36 @@ msgstr "���� ����::"
 msgid "Other Contacts"
 msgstr "�ٸ� ����ó"
 
-#: addressbook/gui/component/addressbook.c:393
+#: addressbook/gui/component/addressbook.c:407
 #, c-format
 msgid "Please enter your email address and password for access to %s"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:401
+#: addressbook/gui/component/addressbook.c:415
 #, fuzzy
 msgid "LDAP Authentication"
 msgstr "����:"
 
-#: addressbook/gui/component/addressbook.c:412
+#: addressbook/gui/component/addressbook.c:426
 msgid "Email Address:"
 msgstr "���ڿ��� �ּ�:"
 
-#: addressbook/gui/component/addressbook.c:425
+#: addressbook/gui/component/addressbook.c:439
 msgid "Password:"
 msgstr "��й�ȣ:"
 
-#: addressbook/gui/component/addressbook.c:488
+#: addressbook/gui/component/addressbook.c:502
 msgid "Unable to open addressbook"
 msgstr "�ּҷ��� ������ �����ϴ�"
 
-#: addressbook/gui/component/addressbook.c:495
+#: addressbook/gui/component/addressbook.c:509
 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:500
+#: addressbook/gui/component/addressbook.c:514
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -938,45 +938,45 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:508
+#: addressbook/gui/component/addressbook.c:522
 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:649
+#: addressbook/gui/component/addressbook.c:663
 #: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:650
+#: addressbook/gui/component/addressbook.c:664
 msgid "Name contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:665
 msgid "Email contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:652
+#: addressbook/gui/component/addressbook.c:666
 #: calendar/gui/cal-search-bar.c:59
 #, fuzzy
 msgid "Category is"
 msgstr "���"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:653 widgets/misc/e-filter-bar.h:97
+#: addressbook/gui/component/addressbook.c:667 widgets/misc/e-filter-bar.h:97
 #: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "����..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:883
+#: addressbook/gui/component/addressbook.c:897
 #: calendar/gui/cal-search-bar.c:412
 #, fuzzy
 msgid "Any Category"
 msgstr "���:"
 
-#: addressbook/gui/component/addressbook.c:925
+#: addressbook/gui/component/addressbook.c:939
 msgid "The URI that the Folder Browser will display"
 msgstr "���� Ž���Ⱑ ǥ���� URI"
 
@@ -991,7 +991,7 @@ msgid "(none)"
 msgstr "(�̸� ����)"
 
 #: addressbook/gui/component/e-address-popup.c:466
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #: addressbook/gui/contact-editor/e-contact-editor.c:1636
 msgid "Primary Email"
 msgstr "�̸���"
@@ -1170,121 +1170,127 @@ msgid "Details"
 msgstr "�ڼ���"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
+msgid "F_ree/Busy URL:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 #, fuzzy
 msgid "File A_s:"
 msgstr "���Ϸ� ����:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "General"
 msgstr "�Ϲ� ����"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+msgid ""
+"If this person publishes free/busy or other calendar information on the "
+"Internet, enter the address\n"
+"of that information here."
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "New phone type"
 msgstr "�� ��ȭ ����"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "No_tes:"
 msgstr "��Ʈ(_t):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #, fuzzy
 msgid "Organi_zation:"
 msgstr "����:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "Phone Types"
 msgstr "��ȭ ����"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "Wants to receive _HTML mail"
 msgstr "HTML���� ���� ���(_H)"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Address..."
 msgstr "�ּ�(_A)..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "_Assistant's name:"
 msgstr "���� �̸�(_A):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Birthday:"
 msgstr "����(_B):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Business"
 msgstr "����(_B)"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#, fuzzy
-msgid "_Calendar Information:"
-msgstr "����� ����"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 #: calendar/gui/dialogs/event-page.glade.h:12
 #: calendar/gui/dialogs/task-page.glade.h:10
 msgid "_Contacts..."
 msgstr "����ó(_C)..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:834 filter/filter.glade.h:8
-#: mail/folder-browser.c:1371 mail/mail-config.glade.h:94
+#: mail/folder-browser.c:1406 mail/mail-config.glade.h:95
 #: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "����(_D)"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Department:"
 msgstr "�μ�(_D):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#, fuzzy
-msgid "_Free/Busy Information:"
-msgstr "����� ����"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Full Name..."
 msgstr "��ü �̸�(_F)..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Home"
 msgstr "��(_H)"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Job title:"
 msgstr "����(_J):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Manager's Name:"
 msgstr "�Ŵ��� �̸�(_M):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Mobile"
 msgstr "�޴���ȭ(_M)"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Nickname:"
 msgstr "����(_N):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Office:"
 msgstr "�繫��(_O):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Profession:"
 msgstr "����(_P):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#, fuzzy
+msgid "_Public Calendar URL:"
+msgstr "�޷�"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Spouse:"
 msgstr "�����(_S):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_This is the mailing address"
 msgstr "�̰��� ���ڿ��� �ּ��Դϴ�(_T)"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "_Web page address:"
 msgstr "Ȩ������ �ּ�:"
@@ -2533,7 +2539,7 @@ msgstr " %d �ʸ���"
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
 #: addressbook/gui/widgets/e-addressbook-view.c:691
 #: addressbook/gui/widgets/e-addressbook-view.c:753
-#: addressbook/gui/widgets/e-addressbook-view.c:1373
+#: addressbook/gui/widgets/e-addressbook-view.c:1422
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "VCard�� ����"
@@ -2591,8 +2597,8 @@ msgid "Success"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1710
-#: shell/e-storage.c:515
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1702
+#: shell/e-storage.c:520
 msgid "Unknown error"
 msgstr "�� ������ ����"
 
@@ -2601,7 +2607,7 @@ msgstr "�� ������ ����"
 msgid "Repository offline"
 msgstr "�������ο��� �۾�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:505
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:510
 msgid "Permission denied"
 msgstr "�㰡�� �ź�"
 
@@ -2620,10 +2626,10 @@ msgid "Protocol not supported"
 msgstr "�۵��� �������� ����"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:733 calendar/gui/calendar-model.c:1274
+#: calendar/gui/calendar-model.c:726 calendar/gui/calendar-model.c:1247
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:544
-#: camel/camel-service.c:580
+#: calendar/gui/e-calendar-table.c:461 camel/camel-service.c:598
+#: camel/camel-service.c:634
 msgid "Cancelled"
 msgstr "��ҵ�"
 
@@ -2653,7 +2659,7 @@ msgid "Error removing list"
 msgstr "%s��(��) �д��� ���� �߻�"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1248
+#: addressbook/gui/widgets/e-addressbook-view.c:1297
 #, fuzzy
 msgid "Error removing card"
 msgstr ""
@@ -2939,8 +2945,8 @@ msgstr "�۲�..."
 msgid "Print cards"
 msgstr "�޷� �μ��ϱ�"
 
-#: addressbook/printing/e-contact-print.c:1112
-#: addressbook/printing/e-contact-print.c:1134
+#: addressbook/printing/e-contact-print.c:1152
+#: addressbook/printing/e-contact-print.c:1174
 #, fuzzy
 msgid "Print card"
 msgstr "�޷� �μ��ϱ�"
@@ -2951,18 +2957,44 @@ msgstr "�޷� �μ��ϱ�"
 msgid "Print envelope"
 msgstr "���� �μ�(_v)..."
 
-#: calendar/conduits/calendar/calendar-conduit.c:735
-#: calendar/conduits/todo/todo-conduit.c:548
+#: calendar/cal-util/cal-util.c:418 calendar/cal-util/cal-util.c:440
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:385 mail/message-list.c:652
+msgid "High"
+msgstr "����"
+
+#: calendar/cal-util/cal-util.c:420 calendar/cal-util/cal-util.c:442
+#: calendar/gui/calendar-model.c:1673
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:386 mail/message-list.c:651
+msgid "Normal"
+msgstr "����"
+
+#: calendar/cal-util/cal-util.c:422 calendar/cal-util/cal-util.c:444
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:387 mail/message-list.c:650
+msgid "Low"
+msgstr "����"
+
+#. An empty string is the same as 'None'.
+#: calendar/cal-util/cal-util.c:438
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:388
+msgid "Undefined"
+msgstr "���Ǿȵ�"
+
+#: calendar/conduits/calendar/calendar-conduit.c:793
+#: calendar/conduits/todo/todo-conduit.c:564
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:839
-#: calendar/conduits/calendar/calendar-conduit.c:842
+#: calendar/conduits/calendar/calendar-conduit.c:896
+#: calendar/conduits/calendar/calendar-conduit.c:899
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:653
-#: calendar/conduits/todo/todo-conduit.c:656
+#: calendar/conduits/todo/todo-conduit.c:668
+#: calendar/conduits/todo/todo-conduit.c:671
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
@@ -3010,47 +3042,47 @@ msgstr "�˶� ���"
 msgid "Factory for the alarm notification service"
 msgstr "�˶� ����� ���� ���丮"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:152
 #, fuzzy, c-format
 msgid "Notification about your appointment starting on %s and ending on %s"
 msgstr "%A %b %d %Y %H:%M�� ��� �ð� �˸�"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:156
 #, fuzzy, c-format
 msgid "Notification about your appointment starting on %s"
 msgstr "%A %b %d %Y %H:%M�� ��� �ð� �˸�"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:161
 #, fuzzy, c-format
 msgid "Notification about your appointment ending on %s"
 msgstr "%A %b %d %Y %H:%M�� ��� �ð� �˸�"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:165
 #, fuzzy
 msgid "Notification about your appointment"
 msgstr "%A %b %d %Y %H:%M�� ��� �ð� �˸�"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:172
 #, fuzzy, c-format
 msgid "Notification about your task starting on %s and ending on %s"
 msgstr "%A %b %d %Y %H:%M�� ��� �ð� �˸�"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:176
 #, fuzzy, c-format
 msgid "Notification about your task starting on %s"
 msgstr "%A %b %d %Y %H:%M�� ��� �ð� �˸�"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:181
 #, fuzzy, c-format
 msgid "Notification about your task ending on %s"
 msgstr "%A %b %d %Y %H:%M�� ��� �ð� �˸�"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:185
 #, fuzzy
 msgid "Notification about your task"
 msgstr "Evolution�� ���� ����"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:267
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "%A %b %d %Y %H:%M�� �˶�"
 
@@ -3135,7 +3167,7 @@ msgstr "%Y/%m/%d"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: calendar/gui/calendar-commands.c:467
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1442
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1446
 msgid "%d %B"
 msgstr ""
 
@@ -3144,17 +3176,17 @@ msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:399 calendar/gui/calendar-model.c:1001
-#: calendar/gui/e-calendar-table.c:307
+#: calendar/gui/calendar-model.c:399 calendar/gui/calendar-model.c:994
+#: calendar/gui/e-calendar-table.c:364
 msgid "Private"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:1003
-#: calendar/gui/e-calendar-table.c:308
+#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:996
+#: calendar/gui/e-calendar-table.c:365
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:306
+#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:363
 msgid "Public"
 msgstr ""
 
@@ -3174,68 +3206,49 @@ msgstr "��"
 msgid "W"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:538 calendar/gui/calendar-model.c:1183
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:652
-msgid "High"
-msgstr "����"
-
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1185
-#: calendar/gui/calendar-model.c:1700
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:651
-msgid "Normal"
-msgstr "����"
-
-#: calendar/gui/calendar-model.c:542 calendar/gui/calendar-model.c:1187
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:650
-msgid "Low"
-msgstr "����"
-
-#: calendar/gui/calendar-model.c:573 calendar/gui/calendar-model.c:1220
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/calendar-model.c:566 calendar/gui/calendar-model.c:1193
+#: calendar/gui/e-calendar-table.c:437
 #, fuzzy
 msgid "Free"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:575 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/calendar-model.c:568 calendar/gui/e-calendar-table.c:438
 #: calendar/gui/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr "�ٻ�"
 
-#: calendar/gui/calendar-model.c:724 calendar/gui/calendar-model.c:1268
+#: calendar/gui/calendar-model.c:717 calendar/gui/calendar-model.c:1241
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:401
+#: calendar/gui/e-calendar-table.c:458
 msgid "Not Started"
 msgstr "���� ����"
 
-#: calendar/gui/calendar-model.c:727 calendar/gui/calendar-model.c:1270
+#: calendar/gui/calendar-model.c:720 calendar/gui/calendar-model.c:1243
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:402
+#: calendar/gui/e-calendar-table.c:459
 msgid "In Progress"
 msgstr "������"
 
-#: calendar/gui/calendar-model.c:730 calendar/gui/calendar-model.c:1272
+#: calendar/gui/calendar-model.c:723 calendar/gui/calendar-model.c:1245
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-meeting-model.c:298
+#: calendar/gui/e-calendar-table.c:460 calendar/gui/e-meeting-model.c:298
 #: calendar/gui/e-meeting-model.c:321
 msgid "Completed"
 msgstr "�Ϸ��"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:915 e-util/e-time-utils.c:163
+#: calendar/gui/calendar-model.c:908 e-util/e-time-utils.c:163
 #: e-util/e-time-utils.c:354
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr ""
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:918 e-util/e-time-utils.c:158
+#: calendar/gui/calendar-model.c:911 e-util/e-time-utils.c:158
 #: e-util/e-time-utils.c:363
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:923
+#: calendar/gui/calendar-model.c:916
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -3243,54 +3256,43 @@ msgid ""
 "%s"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1087
+#: calendar/gui/calendar-model.c:1080
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1127
+#: calendar/gui/calendar-model.c:1120
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1168
-msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
-msgstr ""
-
-#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1181
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:331
-msgid "Undefined"
-msgstr "���Ǿȵ�"
-
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1266 calendar/gui/dialogs/meeting-page.c:332
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1444
+#: calendar/gui/calendar-model.c:1239 calendar/gui/dialogs/meeting-page.c:332
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1446
 #: mail/mail-accounts.c:143 mail/mail-accounts.c:390
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:50
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:203
-#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
-#: widgets/misc/e-dateedit.c:1428 widgets/misc/e-dateedit.c:1543
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:453
+#: widgets/misc/e-dateedit.c:1453 widgets/misc/e-dateedit.c:1568
 msgid "None"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1702
+#: calendar/gui/calendar-model.c:1675
 msgid "Recurring"
 msgstr "�ݺ���"
 
-#: calendar/gui/calendar-model.c:1704
+#: calendar/gui/calendar-model.c:1677
 msgid "Assigned"
 msgstr "�����"
 
-#: calendar/gui/calendar-model.c:1710 calendar/gui/e-meeting-model.c:270
+#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:270
 #: calendar/gui/e-meeting-model.c:280 calendar/gui/e-meeting-model.c:506
 #: calendar/gui/e-meeting-model.c:702
 msgid "Yes"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:1710 calendar/gui/e-meeting-model.c:282
+#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:282
 #: calendar/gui/e-meeting-model.c:703
 msgid "No"
 msgstr "�ƴϿ�"
@@ -3333,42 +3335,42 @@ msgstr "������������"
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/component-factory.c:62 my-evolution/my-evolution.glade.h:6
+#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:6
 #: shell/e-local-storage.c:172 shell/e-shortcuts.c:1056
 msgid "Calendar"
 msgstr "�޷�"
 
-#: calendar/gui/component-factory.c:63
+#: calendar/gui/component-factory.c:64
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/component-factory.c:67 calendar/gui/print.c:1719
-#: my-evolution/e-summary-tasks.c:215 my-evolution/e-summary-tasks.c:231
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1723
+#: my-evolution/e-summary-tasks.c:237 my-evolution/e-summary-tasks.c:253
 #: shell/e-local-storage.c:178 shell/e-shortcuts.c:1059
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "�۾�"
 
-#: calendar/gui/component-factory.c:68
+#: calendar/gui/component-factory.c:69
 #, fuzzy
 msgid "Folder containing to-do items"
 msgstr "���ϸ� ����Ʈ������ ����"
 
-#: calendar/gui/component-factory.c:593 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:581 ui/evolution-calendar.xml.h:7
 msgid "Create a new appointment"
 msgstr "���ο� ��Ӹ� �����"
 
-#: calendar/gui/component-factory.c:594 calendar/gui/e-day-view.c:3420
+#: calendar/gui/component-factory.c:582 calendar/gui/e-day-view.c:3422
 #, fuzzy
 msgid "New _Appointment"
 msgstr "�� ���"
 
-#: calendar/gui/component-factory.c:599 ui/evolution-calendar.xml.h:8
+#: calendar/gui/component-factory.c:587 ui/evolution-calendar.xml.h:8
 #: ui/evolution-tasks.xml.h:5
 msgid "Create a new task"
 msgstr ""
 
-#: calendar/gui/component-factory.c:600
+#: calendar/gui/component-factory.c:588
 #, fuzzy
 msgid "New _Task"
 msgstr "�۾�"
@@ -3449,105 +3451,126 @@ msgstr "��"
 msgid "minutes"
 msgstr "��"
 
-#: calendar/gui/dialogs/alarm-page.c:303
+#: calendar/gui/dialogs/alarm-page.c:307
 #, fuzzy, c-format
 msgid "%d days"
 msgstr " %d ����"
 
-#: calendar/gui/dialogs/alarm-page.c:305
+#: calendar/gui/dialogs/alarm-page.c:310
 #, fuzzy
 msgid "1 day"
 msgstr "�Ϸ羿"
 
-#: calendar/gui/dialogs/alarm-page.c:308
+#: calendar/gui/dialogs/alarm-page.c:315
 #, fuzzy, c-format
 msgid "%d weeks"
 msgstr " %d �־�"
 
-#: calendar/gui/dialogs/alarm-page.c:310
+#: calendar/gui/dialogs/alarm-page.c:318
 #, fuzzy
 msgid "1 week"
 msgstr " ���־�"
 
-#: calendar/gui/dialogs/alarm-page.c:313
+#: calendar/gui/dialogs/alarm-page.c:323
 #, fuzzy, c-format
 msgid "%d hours"
 msgstr " %d ��"
 
-#: calendar/gui/dialogs/alarm-page.c:315
+#: calendar/gui/dialogs/alarm-page.c:326
 #, fuzzy
 msgid "1 hour"
 msgstr " �ѽð���"
 
-#: calendar/gui/dialogs/alarm-page.c:318
+#: calendar/gui/dialogs/alarm-page.c:331
 #, fuzzy, c-format
 msgid "%d minutes"
 msgstr " %d ���"
 
-#: calendar/gui/dialogs/alarm-page.c:320
+#: calendar/gui/dialogs/alarm-page.c:334
 #, fuzzy
 msgid "1 minute"
 msgstr "�Ϻи���"
 
-#: calendar/gui/dialogs/alarm-page.c:323
+#: calendar/gui/dialogs/alarm-page.c:339
 #, fuzzy, c-format
 msgid "%d seconds"
 msgstr " %d �ʸ���"
 
-#: calendar/gui/dialogs/alarm-page.c:325
+#: calendar/gui/dialogs/alarm-page.c:342
 #, fuzzy
 msgid "1 second"
 msgstr " 1 �ʸ���"
 
-#: calendar/gui/dialogs/alarm-page.c:350
+#: calendar/gui/dialogs/alarm-page.c:373
 #: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "�Ҹ� ����"
 
-#: calendar/gui/dialogs/alarm-page.c:354
+#: calendar/gui/dialogs/alarm-page.c:377
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 #, fuzzy
 msgid "Display a message"
 msgstr "��� �޽��� ��� ���̱�"
 
-#: calendar/gui/dialogs/alarm-page.c:358
+#: calendar/gui/dialogs/alarm-page.c:381
 msgid "Send an email"
 msgstr "�̸��� ������"
 
-#: calendar/gui/dialogs/alarm-page.c:362
+#: calendar/gui/dialogs/alarm-page.c:385
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "���α׷��� �����մϴ�"
 
-#: calendar/gui/dialogs/alarm-page.c:368 calendar/gui/dialogs/alarm-page.c:404
-#: calendar/gui/e-meeting-model.c:226 calendar/gui/e-meeting-model.c:261
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:674
-#: calendar/gui/e-meeting-model.c:690
-#: camel/providers/smtp/camel-smtp-transport.c:224
-#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
-msgid "Unknown"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-page.c:380
+#: calendar/gui/dialogs/alarm-page.c:391
 #, fuzzy
-msgid "before start of appointment"
+msgid "Unknown action to be performed"
+msgstr "�� ������ ����"
+
+#: calendar/gui/dialogs/alarm-page.c:403
+#, fuzzy, c-format
+msgid "%s %s before the start of the appointment"
 msgstr "��ӽ�����"
 
-#: calendar/gui/dialogs/alarm-page.c:383
-#, fuzzy
-msgid "after start of appointment"
-msgstr "��� ������"
+#: calendar/gui/dialogs/alarm-page.c:406
+#, fuzzy, c-format
+msgid "%s %s after the start of the appointment"
+msgstr "��ӽ�����"
 
-#: calendar/gui/dialogs/alarm-page.c:393
-#, fuzzy
-msgid "before end of appointment"
-msgstr "��� ��������"
+#: calendar/gui/dialogs/alarm-page.c:411
+#, fuzzy, c-format
+msgid "%s at the start of the appointment"
+msgstr "��ӽ�����"
 
-#: calendar/gui/dialogs/alarm-page.c:396
-#, fuzzy
-msgid "after end of appointment"
+#: calendar/gui/dialogs/alarm-page.c:420
+#, fuzzy, c-format
+msgid "%s %s before the end of the appointment"
+msgstr "��ӽ�����"
+
+#: calendar/gui/dialogs/alarm-page.c:423
+#, fuzzy, c-format
+msgid "%s %s after the end of the appointment"
 msgstr "��� ���� ��"
 
+#: calendar/gui/dialogs/alarm-page.c:428
+#, fuzzy, c-format
+msgid "%s at the end of the appointment"
+msgstr "��� ���� ��"
+
+#: calendar/gui/dialogs/alarm-page.c:439
+#, fuzzy, c-format
+msgid "%s at an unknown time"
+msgstr "�� ������ ����"
+
+#: calendar/gui/dialogs/alarm-page.c:445
+#, fuzzy, c-format
+msgid "%s at %s"
+msgstr "%s ���� ���� %s"
+
+#: calendar/gui/dialogs/alarm-page.c:452
+#, c-format
+msgid "%s for an unknown trigger type"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3896,110 +3919,110 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:159 calendar/gui/print.c:2128
+#: calendar/gui/dialogs/comp-editor-util.c:167 calendar/gui/print.c:2132
 msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:163 calendar/gui/print.c:2132
+#: calendar/gui/dialogs/comp-editor-util.c:171 calendar/gui/print.c:2136
 #, fuzzy
 msgid " (Completed "
 msgstr "�Ϸ��"
 
-#: calendar/gui/dialogs/comp-editor-util.c:165 calendar/gui/print.c:2134
+#: calendar/gui/dialogs/comp-editor-util.c:173 calendar/gui/print.c:2138
 #, fuzzy
 msgid "Completed "
 msgstr "�Ϸ��"
 
-#: calendar/gui/dialogs/comp-editor-util.c:170 calendar/gui/print.c:2139
+#: calendar/gui/dialogs/comp-editor-util.c:178 calendar/gui/print.c:2143
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2141
+#: calendar/gui/dialogs/comp-editor-util.c:180 calendar/gui/print.c:2145
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:515
+#: calendar/gui/dialogs/comp-editor.c:521
 msgid "Edit Appointment"
 msgstr "����� �����Ѵ�"
 
-#: calendar/gui/dialogs/comp-editor.c:520
+#: calendar/gui/dialogs/comp-editor.c:526
 #, c-format
 msgid "Appointment - %s"
 msgstr "��� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:523
+#: calendar/gui/dialogs/comp-editor.c:529
 #, c-format
 msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:526
+#: calendar/gui/dialogs/comp-editor.c:532
 #, c-format
 msgid "Journal entry - %s"
 msgstr "���� ���� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:540
+#: calendar/gui/dialogs/comp-editor.c:546
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:950 mail/mail-callbacks.c:1662
+#: calendar/gui/dialogs/comp-editor.c:952 mail/mail-callbacks.c:1671
 #: mail/mail-display.c:100
 msgid "Overwrite file?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:954 mail/mail-callbacks.c:1668
+#: calendar/gui/dialogs/comp-editor.c:956 mail/mail-callbacks.c:1677
 #: mail/mail-display.c:104
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1017 ui/evolution-comp-editor.xml.h:13
+#: calendar/gui/dialogs/comp-editor.c:1019 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "�ٸ� �̸����� ����..."
 
-#: calendar/gui/dialogs/comp-editor.c:1170
+#: calendar/gui/dialogs/comp-editor.c:1172
 msgid "Unable to obtain current version!"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:90
+#: calendar/gui/dialogs/delete-comp.c:91
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "������ ��� `%s'�� ����⸦ ���Ͻʴϱ�"
 
-#: calendar/gui/dialogs/delete-comp.c:93
+#: calendar/gui/dialogs/delete-comp.c:94
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "������ �� ������� ����� ����⸦ ���Ͻʴϱ�"
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:100
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "������ �۾� `%s'�� ����⸦ ���Ͻʴϱ�"
 
-#: calendar/gui/dialogs/delete-comp.c:102
+#: calendar/gui/dialogs/delete-comp.c:103
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "������ �� ������� �۾��� ����⸦ ���Ͻʴϱ�"
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:109
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "������ �������� `%s'�� ����⸦ ���Ͻʴϱ�"
 
-#: calendar/gui/dialogs/delete-comp.c:111
+#: calendar/gui/dialogs/delete-comp.c:112
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "������ �� ������� ���������� ����⸦ ���Ͻʴϱ�"
 
-#: calendar/gui/dialogs/delete-comp.c:126
+#: calendar/gui/dialogs/delete-comp.c:127
 #, fuzzy, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "������ ��� `%s'�� ����⸦ ���Ͻʴϱ�"
 
-#: calendar/gui/dialogs/delete-comp.c:131
+#: calendar/gui/dialogs/delete-comp.c:132
 #, fuzzy, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "������ �۾� `%s'�� ����⸦ ���Ͻʴϱ�"
 
-#: calendar/gui/dialogs/delete-comp.c:136
+#: calendar/gui/dialogs/delete-comp.c:137
 #, fuzzy, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "������ �������� `%s'�� ����⸦ ���Ͻʴϱ�"
@@ -4198,7 +4221,7 @@ msgstr "����"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:18
-#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:85
+#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:86
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr ""
@@ -4223,8 +4246,8 @@ msgstr "�ٸ� �̵��� �ʴ�(_I)..."
 msgid "_Other Organizer"
 msgstr "����:"
 
-#: calendar/gui/dialogs/recurrence-page.c:422 calendar/gui/print.c:1851
-#: calendar/gui/print.c:1853 calendar/gui/print.c:1854
+#: calendar/gui/dialogs/recurrence-page.c:422 calendar/gui/print.c:1855
+#: calendar/gui/print.c:1857 calendar/gui/print.c:1858
 msgid "%a %b %d %Y"
 msgstr ""
 
@@ -4345,7 +4368,7 @@ msgid "Progress"
 msgstr "������"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:910
+#: my-evolution/e-summary-preferences.c:949
 msgid "URL:"
 msgstr ""
 
@@ -4365,7 +4388,7 @@ msgstr "�����"
 
 #: calendar/gui/dialogs/task-page.glade.h:4
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:28
 msgid "Description:"
 msgstr "����:"
 
@@ -4381,110 +4404,110 @@ msgstr ""
 msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:350
+#: calendar/gui/e-calendar-table.c:407
 #, c-format
 msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:351
+#: calendar/gui/e-calendar-table.c:408
 #, c-format
 msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:409
 #, c-format
 msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:410
 #, c-format
 msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:411
 #, c-format
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:412
 #, c-format
 msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:356
+#: calendar/gui/e-calendar-table.c:413
 #, c-format
 msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:357
+#: calendar/gui/e-calendar-table.c:414
 #, c-format
 msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:358
+#: calendar/gui/e-calendar-table.c:415
 #, c-format
 msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:359
+#: calendar/gui/e-calendar-table.c:416
 #, c-format
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:360
+#: calendar/gui/e-calendar-table.c:417
 #, c-format
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3441
-#: calendar/gui/e-week-view.c:3288 mail/folder-browser.c:1336
+#: calendar/gui/e-calendar-table.c:914 calendar/gui/e-day-view.c:3443
+#: calendar/gui/e-week-view.c:3296 mail/folder-browser.c:1371
 #: shell/e-shortcuts-view.c:385
 #, fuzzy
 msgid "_Open"
 msgstr "����"
 
-#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3450
-#: calendar/gui/e-week-view.c:3297 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:918 calendar/gui/e-day-view.c:3452
+#: calendar/gui/e-week-view.c:3305 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:856 calendar/gui/e-day-view.c:3452
-#: calendar/gui/e-week-view.c:3299 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:920 calendar/gui/e-day-view.c:3454
+#: calendar/gui/e-week-view.c:3307 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:14
 msgid "_Copy"
 msgstr "����(_C)"
 
-#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3427
-#: calendar/gui/e-day-view.c:3454 calendar/gui/e-week-view.c:3275
-#: calendar/gui/e-week-view.c:3301 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:922 calendar/gui/e-day-view.c:3429
+#: calendar/gui/e-day-view.c:3456 calendar/gui/e-week-view.c:3283
+#: calendar/gui/e-week-view.c:3309 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:40 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:17
 msgid "_Paste"
 msgstr "���̱�(_P)"
 
-#: calendar/gui/e-calendar-table.c:863
+#: calendar/gui/e-calendar-table.c:927
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "�Ϸ� ǥ��"
 
-#: calendar/gui/e-calendar-table.c:865
+#: calendar/gui/e-calendar-table.c:929
 #, fuzzy
 msgid "_Delete this Task"
 msgstr "�� ������ �����մϴ�"
 
-#: calendar/gui/e-calendar-table.c:868
+#: calendar/gui/e-calendar-table.c:932
 #, fuzzy
 msgid "_Mark Tasks as Complete"
 msgstr "�Ϸ� ǥ��"
 
-#: calendar/gui/e-calendar-table.c:870
+#: calendar/gui/e-calendar-table.c:934
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "�� ������ �����մϴ�"
 
-#: calendar/gui/e-calendar-table.c:1130
+#: calendar/gui/e-calendar-table.c:1194
 #: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Click to add a task"
@@ -4494,8 +4517,8 @@ msgstr "�۾���Ͽ� �߰��ϱ�"
 msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:702
-#: camel/camel-filter-driver.c:819
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:718
+#: camel/camel-filter-driver.c:834
 #, fuzzy
 msgid "Complete"
 msgstr "�Ϸ��"
@@ -4527,8 +4550,8 @@ 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:30 shell/e-shortcuts.c:1050
-#: shell/e-storage-set-view.c:1424 shell/e-summary-storage.c:80
+#: my-evolution/component-factory.c:45 shell/e-shortcuts.c:1050
+#: shell/e-storage-set-view.c:1420 shell/e-summary-storage.c:80
 msgid "Summary"
 msgstr "���"
 
@@ -4549,7 +4572,7 @@ 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:285 calendar/gui/e-day-view.c:1374
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1458
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
 msgid "%A %d %B"
 msgstr ""
 
@@ -4561,295 +4584,312 @@ msgid "%d %b"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:608 calendar/gui/e-week-view.c:344
-#: calendar/gui/print.c:765
+#: calendar/gui/e-day-view.c:608 calendar/gui/e-week-view.c:345
+#: calendar/gui/print.c:769
 msgid "am"
 msgstr "����"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:347
-#: calendar/gui/print.c:767
+#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:348
+#: calendar/gui/print.c:771
 msgid "pm"
 msgstr "����"
 
-#: calendar/gui/e-day-view.c:3422 calendar/gui/e-week-view.c:3270
+#: calendar/gui/e-day-view.c:3424 calendar/gui/e-week-view.c:3278
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3432 calendar/gui/e-week-view.c:3280
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3288
 #: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "���÷� �̵�(_T)"
 
-#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3282
+#: calendar/gui/e-day-view.c:3436 calendar/gui/e-week-view.c:3290
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "��¥�� �̵�..."
 
-#: calendar/gui/e-day-view.c:3443 calendar/gui/e-week-view.c:3290
+#: calendar/gui/e-day-view.c:3445 calendar/gui/e-week-view.c:3298
 #, fuzzy
 msgid "_Delete this Appointment"
 msgstr "�� ����� �����մϴ�"
 
-#: calendar/gui/e-day-view.c:3462 calendar/gui/e-week-view.c:3315
+#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3323
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "���� ������ ����"
 
-#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3317
+#: calendar/gui/e-day-view.c:3466 calendar/gui/e-week-view.c:3325
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "�� �޼����� �����մϴ�"
 
-#: calendar/gui/e-day-view.c:3466 calendar/gui/e-week-view.c:3319
+#: calendar/gui/e-day-view.c:3468 calendar/gui/e-week-view.c:3327
 msgid "Delete _All Occurrences"
 msgstr ""
 
+#: calendar/gui/e-itip-control.c:469
+msgid "Meeting begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:474
+msgid "Task begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:479
+#, fuzzy
+msgid "Free/Busy info begins: <b>"
+msgstr "����� ����"
+
+#: calendar/gui/e-itip-control.c:483
+msgid "Begins: <b>"
+msgstr ""
+
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:677
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:664
+#: calendar/gui/e-itip-control.c:692
 #, c-format
 msgid "<b>Summary:</b> %s<br><br>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:664
+#: calendar/gui/e-itip-control.c:692
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:674
+#: calendar/gui/e-itip-control.c:702
 #, fuzzy, c-format
 msgid "<b>Description:</b> %s"
 msgstr "����:"
 
-#: calendar/gui/e-itip-control.c:710
+#: calendar/gui/e-itip-control.c:737
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:738
 #, fuzzy
 msgid "Meeting Information"
 msgstr "���� ����"
 
-#: calendar/gui/e-itip-control.c:715
+#: calendar/gui/e-itip-control.c:742
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:716
+#: calendar/gui/e-itip-control.c:743
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "���� ���"
 
-#: calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-itip-control.c:747
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:721
+#: calendar/gui/e-itip-control.c:748
 #, fuzzy
 msgid "Meeting Update"
 msgstr "ȸ�� ���� �ð�(_e):"
 
-#: calendar/gui/e-itip-control.c:725
+#: calendar/gui/e-itip-control.c:752
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:726
+#: calendar/gui/e-itip-control.c:753
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:730
+#: calendar/gui/e-itip-control.c:757
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "�̰��� ���ڿ��� �ּ��Դϴ�(_T)"
 
-#: calendar/gui/e-itip-control.c:731
+#: calendar/gui/e-itip-control.c:758
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "���� ���"
 
-#: calendar/gui/e-itip-control.c:735
+#: calendar/gui/e-itip-control.c:762
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:736
+#: calendar/gui/e-itip-control.c:763
 #, fuzzy
 msgid "Meeting Cancellation"
 msgstr "������ ��������"
 
-#: calendar/gui/e-itip-control.c:740 calendar/gui/e-itip-control.c:788
-#: calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:767 calendar/gui/e-itip-control.c:815
+#: calendar/gui/e-itip-control.c:848
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:741
+#: calendar/gui/e-itip-control.c:768
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "�޼����� ����"
 
-#: calendar/gui/e-itip-control.c:758
+#: calendar/gui/e-itip-control.c:785
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:759
+#: calendar/gui/e-itip-control.c:786
 #, fuzzy
 msgid "Task Information"
 msgstr "����"
 
-#: calendar/gui/e-itip-control.c:763
+#: calendar/gui/e-itip-control.c:790
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:791
 #, fuzzy
 msgid "Task Proposal"
 msgstr "�۾��е�"
 
-#: calendar/gui/e-itip-control.c:768
+#: calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:769
+#: calendar/gui/e-itip-control.c:796
 #, fuzzy
 msgid "Task Update"
 msgstr "�۾�"
 
-#: calendar/gui/e-itip-control.c:773
+#: calendar/gui/e-itip-control.c:800
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:774
+#: calendar/gui/e-itip-control.c:801
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:778
+#: calendar/gui/e-itip-control.c:805
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "�̰��� ���ڿ��� �ּ��Դϴ�(_T)"
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:806
 #, fuzzy
 msgid "Task Reply"
 msgstr "ȸ��"
 
-#: calendar/gui/e-itip-control.c:783
+#: calendar/gui/e-itip-control.c:810
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:784
+#: calendar/gui/e-itip-control.c:811
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "���� ���"
 
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:816
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "�޼����� ����"
 
-#: calendar/gui/e-itip-control.c:806
+#: calendar/gui/e-itip-control.c:833
 #, fuzzy, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "����� ����"
 
-#: calendar/gui/e-itip-control.c:807
+#: calendar/gui/e-itip-control.c:834
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "����� ����"
 
-#: calendar/gui/e-itip-control.c:811
+#: calendar/gui/e-itip-control.c:838
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:812
+#: calendar/gui/e-itip-control.c:839
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:816
+#: calendar/gui/e-itip-control.c:843
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "�̰��� ���ڿ��� �ּ��Դϴ�(_T)"
 
-#: calendar/gui/e-itip-control.c:817
+#: calendar/gui/e-itip-control.c:844
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:822
+#: calendar/gui/e-itip-control.c:849
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "�޼��� �μ�"
 
-#: calendar/gui/e-itip-control.c:889
+#: calendar/gui/e-itip-control.c:916
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:908
+#: calendar/gui/e-itip-control.c:935
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:936 calendar/gui/e-itip-control.c:942
+#: calendar/gui/e-itip-control.c:963 calendar/gui/e-itip-control.c:969
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1088
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1063
+#: calendar/gui/e-itip-control.c:1090
 #, fuzzy
 msgid "Update complete\n"
 msgstr "�Ϸ�� ��¥:"
 
-#: calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.c:1134
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1142
 msgid "Attendee status ould not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1144
 #, fuzzy
 msgid "Attendee status updated\n"
 msgstr "������ �ּ�"
 
-#: calendar/gui/e-itip-control.c:1119
+#: calendar/gui/e-itip-control.c:1146
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1174
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-itip-control.c:1176
 #, fuzzy
 msgid "Removal Complete"
 msgstr "% �Ϸ�(_p):"
 
-#: calendar/gui/e-itip-control.c:1181 calendar/gui/e-itip-control.c:1216
+#: calendar/gui/e-itip-control.c:1208 calendar/gui/e-itip-control.c:1242
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "���� ��¥"
 
-#: calendar/gui/e-itip-control.c:1183 calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1210 calendar/gui/e-itip-control.c:1246
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1380
+#: calendar/gui/e-itip-control.c:1406
 msgid "Unable to find any of your identities in the attendees list!\n"
 msgstr ""
 
@@ -4913,6 +4953,14 @@ msgstr "�������:"
 msgid "Room"
 msgstr ""
 
+#: calendar/gui/e-meeting-model.c:226 calendar/gui/e-meeting-model.c:261
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:674
+#: calendar/gui/e-meeting-model.c:690
+#: camel/providers/smtp/camel-smtp-transport.c:224
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
+msgid "Unknown"
+msgstr ""
+
 #: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
 #: calendar/gui/e-meeting-model.c:686
 msgid "Chair"
@@ -4970,14 +5018,14 @@ msgstr "������"
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:472
-#: calendar/gui/e-meeting-time-sel.c:1936
+#: calendar/gui/e-meeting-time-sel.c:1937
 msgid "%A, %B %d, %Y"
 msgstr ""
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:476
-#: calendar/gui/e-meeting-time-sel.c:1964 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel.c:1965 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:345
 msgid "%a %m/%d/%Y"
 msgstr ""
@@ -4985,7 +5033,7 @@ msgstr ""
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:480 e-util/e-time-utils.c:221
-#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1552
+#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1577
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
@@ -5063,17 +5111,17 @@ msgstr ""
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3268 calendar/gui/e-week-view.c:3306
+#: calendar/gui/e-week-view.c:3276 calendar/gui/e-week-view.c:3314
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "�� ���..."
 
-#: calendar/gui/gnome-cal.c:1318
+#: calendar/gui/gnome-cal.c:1319
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "`%s'���ִ� ������ ������ �����ϴ�"
 
-#: calendar/gui/gnome-cal.c:1329
+#: calendar/gui/gnome-cal.c:1330
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr ""
@@ -5144,202 +5192,202 @@ msgstr ""
 msgid "Could not create the component editor factory"
 msgstr "�˶� ��� ���丮�� ������� �����ϴ�"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "1st"
 msgstr ""
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "2nd"
 msgstr ""
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "3rd"
 msgstr ""
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "4th"
 msgstr ""
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:426
 msgid "5th"
 msgstr ""
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "6th"
 msgstr ""
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "7th"
 msgstr ""
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "8th"
 msgstr ""
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "9th"
 msgstr ""
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:427
 msgid "10th"
 msgstr ""
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "11th"
 msgstr ""
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "12th"
 msgstr ""
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "13th"
 msgstr ""
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "14th"
 msgstr ""
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:428
 msgid "15th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "16th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "17th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "18th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "19th"
 msgstr ""
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:429
 msgid "20th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "21st"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "22nd"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "23rd"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "24th"
 msgstr ""
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:430
 msgid "25th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "26th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "27th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "28th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "29th"
 msgstr ""
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:431
 msgid "30th"
 msgstr ""
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:432
 msgid "31st"
 msgstr ""
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "Su"
 msgstr ""
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "Mo"
 msgstr ""
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "Tu"
 msgstr ""
 
-#: calendar/gui/print.c:496
+#: calendar/gui/print.c:499
 msgid "We"
 msgstr ""
 
-#: calendar/gui/print.c:497
+#: calendar/gui/print.c:500
 msgid "Th"
 msgstr ""
 
-#: calendar/gui/print.c:497
+#: calendar/gui/print.c:500
 msgid "Fr"
 msgstr ""
 
-#: calendar/gui/print.c:497
+#: calendar/gui/print.c:500
 msgid "Sa"
 msgstr ""
 
 #. Day
-#: calendar/gui/print.c:1827
+#: calendar/gui/print.c:1831
 msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1846 calendar/gui/print.c:1850
+#: calendar/gui/print.c:1850 calendar/gui/print.c:1854
 msgid "%a %b %d"
 msgstr ""
 
-#: calendar/gui/print.c:1847
+#: calendar/gui/print.c:1851
 msgid "%a %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1858
+#: calendar/gui/print.c:1862
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1866
+#: calendar/gui/print.c:1870
 msgid "Selected month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1873
+#: calendar/gui/print.c:1877
 msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:2214
+#: calendar/gui/print.c:2221
 msgid "Print Calendar"
 msgstr ""
 
-#: calendar/gui/print.c:2302 calendar/gui/print.c:2394
-#: mail/mail-callbacks.c:2071 my-evolution/e-summary.c:551
+#: calendar/gui/print.c:2312 calendar/gui/print.c:2404
+#: mail/mail-callbacks.c:2080 my-evolution/e-summary.c:607
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
 msgstr "�μ� �̸�����"
 
-#: calendar/gui/print.c:2331
+#: calendar/gui/print.c:2341
 #, fuzzy
 msgid "Print Item"
 msgstr "�� �׸��� �μ�"
 
-#: calendar/gui/print.c:2412
+#: calendar/gui/print.c:2422
 msgid "Print Setup"
 msgstr "�μ� ����"
 
@@ -5528,72 +5576,89 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr ""
 
-#: camel/camel-disco-store.c:305
+#: camel/camel-disco-store.c:336
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
+#: camel/camel-filter-driver.c:549 camel/camel-filter-driver.c:558
 #, fuzzy
 msgid "Syncing folders"
 msgstr "���� ����ȭ"
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:659
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "�ּҷ��� ������ �����ϴ�"
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:668
 #, fuzzy
 msgid "Unable to process spool folder"
 msgstr "�ּҷ��� ������ �����ϴ�"
 
-#: camel/camel-filter-driver.c:667
+#: camel/camel-filter-driver.c:683
 #, fuzzy, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "�޼��� %s�� ��������"
 
-#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
+#: camel/camel-filter-driver.c:687 camel/camel-filter-driver.c:700
 #, fuzzy, c-format
 msgid "Failed on message %d"
 msgstr "���޵� �޽��� - %s"
 
-#: camel/camel-filter-driver.c:672
+#: camel/camel-filter-driver.c:688
 #, fuzzy
 msgid "Cannot open message"
 msgstr ""
 "�޼����� ������ ����: %s\n"
 "  %s"
 
-#: camel/camel-filter-driver.c:698 camel/camel-filter-driver.c:814
+#: camel/camel-filter-driver.c:714 camel/camel-filter-driver.c:829
 #, fuzzy
 msgid "Syncing folder"
 msgstr "���� ����ȭ"
 
-#: camel/camel-filter-driver.c:770
+#: camel/camel-filter-driver.c:786
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "%2$d�� %1$d�޽��� ���� (uid \"%3$s\")"
 
-#: camel/camel-filter-driver.c:775 camel/camel-filter-driver.c:793
+#: camel/camel-filter-driver.c:791 camel/camel-filter-driver.c:809
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "%2$d�� %1$d�޽��� ���� (uid \"%3$s\")"
 
-#: camel/camel-filter-driver.c:900
+#: camel/camel-filter-driver.c:918
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "���� ��� ����: %s: %s"
 
-#: camel/camel-filter-driver.c:906
+#: camel/camel-filter-driver.c:924
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "���� ������ ����: %s: %s"
 
-#: camel/camel-filter-search.c:479 camel/camel-filter-search.c:486
+#: camel/camel-filter-search.c:494 camel/camel-filter-search.c:501
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "���� � ������ ����: %s: %s"
 
+#: camel/camel-folder.c:472
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1039
+#, fuzzy, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr ""
+"ã�⸦ ���൵�� ����: %s:\n"
+"%s"
+
+#: camel/camel-folder.c:1219
+#, fuzzy
+msgid "Moving messages"
+msgstr "�޼��� ����"
+
 #: camel/camel-folder-search.c:333
 #, c-format
 msgid ""
@@ -5619,7 +5684,7 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:747 camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:748 camel/camel-folder-search.c:792
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
@@ -5718,76 +5783,76 @@ msgstr "���� �ӽ������� ������ �����߻�: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "���� �ӽ������� ������ �����߻�: %s"
 
-#: camel/camel-pgp-context.c:193
+#: camel/camel-pgp-context.c:191
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:196
+#: camel/camel-pgp-context.c:194
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr ""
 
-#: camel/camel-pgp-context.c:518
+#: camel/camel-pgp-context.c:525
 #, fuzzy
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr ""
 "�޼����� ������ ����: %s\n"
 "  %s"
 
-#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:532 camel/camel-pgp-context.c:706
 msgid "Cannot sign this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:538 camel/camel-pgp-context.c:712
 #, c-format
 msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:693
+#: camel/camel-pgp-context.c:699
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr ""
 
-#: camel/camel-pgp-context.c:886
+#: camel/camel-pgp-context.c:891
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr ""
 
-#: camel/camel-pgp-context.c:892
+#: camel/camel-pgp-context.c:897
 #, c-format
 msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:903
+#: camel/camel-pgp-context.c:908
 #, fuzzy, c-format
 msgid "Cannot verify this message: couldn't create temp file: %s"
 msgstr "�ӽ� ������ ����� ����: %s"
 
-#: camel/camel-pgp-context.c:1069
+#: camel/camel-pgp-context.c:1076
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1079
+#: camel/camel-pgp-context.c:1086
 msgid "Cannot encrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1086
+#: camel/camel-pgp-context.c:1093
 #, c-format
 msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1095
+#: camel/camel-pgp-context.c:1102
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1258
+#: camel/camel-pgp-context.c:1264
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1266
+#: camel/camel-pgp-context.c:1272
 msgid "Cannot decrypt this message: no password provided"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1273
+#: camel/camel-pgp-context.c:1279
 #, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
@@ -5831,13 +5896,13 @@ msgstr ""
 msgid "(unknown host)"
 msgstr "(�𸣴� ȣ��Ʈ)"
 
-#: camel/camel-remote-store.c:361 camel/camel-remote-store.c:423
-#: camel/camel-remote-store.c:486
+#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
+#: camel/camel-remote-store.c:483
 #: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "�۾� ���"
 
-#: camel/camel-remote-store.c:489
+#: camel/camel-remote-store.c:486
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -5935,7 +6000,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:492
+#: camel/providers/imap/camel-imap-store.c:494
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -5954,7 +6019,7 @@ msgstr "���� ����."
 
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:302
-#: camel/providers/pop3/camel-pop3-provider.c:68 mail/mail-config.glade.h:54
+#: camel/providers/pop3/camel-pop3-provider.c:68 mail/mail-config.glade.h:55
 msgid "Password"
 msgstr "��й�ȣ"
 
@@ -5983,37 +6048,37 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:154
+#: camel/camel-service.c:157
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:162
+#: camel/camel-service.c:165
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:170
+#: camel/camel-service.c:173
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:548
+#: camel/camel-service.c:602
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:575
+#: camel/camel-service.c:629
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:600
+#: camel/camel-service.c:654
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:602
+#: camel/camel-service.c:656
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
@@ -6026,12 +6091,12 @@ msgstr ""
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:322 camel/camel-session.c:391
+#: camel/camel-session.c:324 camel/camel-session.c:393
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:508
+#: camel/camel-session.c:510
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -6083,7 +6148,7 @@ msgstr ""
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: camel/camel-tcp-stream-openssl.c:463
+#: camel/camel-tcp-stream-openssl.c:491
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -6091,7 +6156,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:369
+#: camel/camel-tcp-stream-openssl.c:496 camel/camel-tcp-stream-ssl.c:369
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -6118,17 +6183,37 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "����Ÿ�� �� ���� �����ϴ�: %s"
 
-#: camel/camel-vee-folder.c:546
+#: camel/camel-vee-folder.c:554
 #, fuzzy, c-format
 msgid "No such message %s in %s"
 msgstr "�׷� �޼��� ����: %s"
 
-#: camel/camel-vee-folder.c:641
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message: %s"
 msgstr "�׷� �޼��� ����: %s"
 
-#: camel/camel-vtrash-folder.c:106
+#: camel/camel-vee-store.c:250
+#, fuzzy, c-format
+msgid "Cannot delete folder: %s: Invalid operation"
+msgstr "������ ������ �����ϴ�: %s: %s"
+
+#: camel/camel-vee-store.c:286
+#, fuzzy, c-format
+msgid "Cannot delete folder: %s: No such folder"
+msgstr "������ ������ �����ϴ�: %s: %s"
+
+#: camel/camel-vee-store.c:298
+#, fuzzy, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "������ ������ �����ϴ�: %s: %s"
+
+#: camel/camel-vee-store.c:326
+#, fuzzy, c-format
+msgid "Cannot rename folder: %s: No such folder"
+msgstr "������ ������ �����ϴ�: %s: %s"
+
+#: camel/camel-vtrash-folder.c:109
 #, fuzzy
 msgid "You cannot copy messages from this trash folder."
 msgstr ""
@@ -6180,7 +6265,7 @@ msgid "Scanning for changed messages"
 msgstr "�޽������� ����"
 
 #: camel/providers/imap/camel-imap-folder.c:1491
-#: camel/providers/imap/camel-imap-folder.c:1890
+#: camel/providers/imap/camel-imap-folder.c:1899
 msgid "This message is not currently available"
 msgstr "�� �޽����� ���� ������ ���� �����ϴ�"
 
@@ -6194,7 +6279,7 @@ msgstr ""
 msgid "Scanning for new messages"
 msgstr "�޽������� ����"
 
-#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/imap/camel-imap-folder.c:1936
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -6213,7 +6298,7 @@ msgstr ""
 msgid "Failed to cache message %s: %s"
 msgstr "�޼����� ������ ÷���մϴ�"
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:14
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Checking for new mail"
 msgstr "�� ������ �ۼ��մϴ�"
@@ -6223,7 +6308,7 @@ msgstr "�� ������ �ۼ��մϴ�"
 msgid "Check for new messages in all folders"
 msgstr "�޼����� �� ������ �����մϴ�"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:733
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:767
 msgid "Folders"
 msgstr "����"
 
@@ -6256,28 +6341,28 @@ msgstr ""
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:515
+#: camel/providers/imap/camel-imap-store.c:517
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:525
+#: camel/providers/imap/camel-imap-store.c:527
 #: camel/providers/smtp/camel-smtp-transport.c:388
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "%s Ÿ�� ������ ���� ����"
 
-#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap/camel-imap-store.c:551
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:566
 #: camel/providers/smtp/camel-smtp-transport.c:432
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:590
+#: camel/providers/imap/camel-imap-store.c:592
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6285,12 +6370,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:889
+#: camel/providers/imap/camel-imap-store.c:891
 #, c-format
 msgid "No such folder %s"
 msgstr "%s���� ������ ����"
 
-#: camel/providers/imap/camel-imap-store.c:1090
+#: camel/providers/imap/camel-imap-store.c:1131
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -6324,51 +6409,51 @@ msgstr ""
 msgid "For storing local mail in qmail maildir directories."
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:77
+#: camel/providers/local/camel-local-provider.c:78
 msgid "Standard Unix mbox spools"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:78
+#: camel/providers/local/camel-local-provider.c:79
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:127
-#: camel/providers/local/camel-spool-store.c:112
+#: camel/providers/local/camel-local-store.c:132
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:134
+#: camel/providers/local/camel-local-store.c:139
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:142
-#: camel/providers/local/camel-local-store.c:158
+#: camel/providers/local/camel-local-store.c:147
+#: camel/providers/local/camel-local-store.c:163
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:173
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:183
+#: camel/providers/local/camel-local-store.c:190
 #, c-format
 msgid "Local mail file %s"
 msgstr "���� ���� ���� %s"
 
-#: camel/providers/local/camel-local-store.c:240
+#: camel/providers/local/camel-local-store.c:247
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:282
+#: camel/providers/local/camel-local-store.c:289
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:292
+#: camel/providers/local/camel-local-store.c:299
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
@@ -6652,26 +6737,26 @@ msgstr ""
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "���������� �޼����� �����ϼ� �����ϴ�: %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:133
+#: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Spool `%s' does not exist or is not a regular file"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:159
+#: camel/providers/local/camel-spool-store.c:142
 #, fuzzy, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "���� `%s'�� �������� �ʽ��ϴ�."
 
-#: camel/providers/local/camel-spool-store.c:181
+#: camel/providers/local/camel-spool-store.c:164
 #, fuzzy, c-format
 msgid "Spool mail file %s"
 msgstr "���� ���� ���� %s"
 
-#: camel/providers/local/camel-spool-store.c:227
+#: camel/providers/local/camel-spool-store.c:210
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:235
+#: camel/providers/local/camel-spool-store.c:218
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
@@ -6798,31 +6883,31 @@ msgstr "POP ����� ������"
 msgid "Could not check POP server for new messages: %s"
 msgstr "�޼����� ������ ����: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:235
+#: camel/providers/pop3/camel-pop3-folder.c:242
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:259
+#: camel/providers/pop3/camel-pop3-folder.c:266
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "������ �޼����� �μ��մϴ�"
 
-#: camel/providers/pop3/camel-pop3-folder.c:335
+#: camel/providers/pop3/camel-pop3-folder.c:342
 #, fuzzy, c-format
 msgid "Could not fetch message: %s"
 msgstr "�޼����� ������ ����: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:351
+#: camel/providers/pop3/camel-pop3-folder.c:358
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:374
+#: camel/providers/pop3/camel-pop3-folder.c:381
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:378
+#: camel/providers/pop3/camel-pop3-folder.c:385
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "POP �޼��� %d�� ������"
@@ -6842,7 +6927,7 @@ msgstr "������ ���� �����"
 msgid "Delete after %s day(s)"
 msgstr "�� ������ �����մϴ�"
 
-#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:53
+#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:54
 msgid "POP"
 msgstr ""
 
@@ -6924,7 +7009,7 @@ msgid "Unexpected response from POP server: %s"
 msgstr "IMAP server�κ��� ����ġ���� �亯: %s"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:73
 msgid "Sendmail"
 msgstr ""
 
@@ -6976,7 +7061,7 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr "sendmail�� ���� ���� ����"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:66
 msgid "SMTP"
 msgstr ""
 
@@ -7605,13 +7690,13 @@ msgstr ""
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:309 e-util/e-time-utils.c:396
-#: widgets/misc/e-dateedit.c:1360 widgets/misc/e-dateedit.c:1587
+#: widgets/misc/e-dateedit.c:1385 widgets/misc/e-dateedit.c:1612
 msgid "%I:%M %p"
 msgstr ""
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:313 e-util/e-time-utils.c:388
-#: widgets/misc/e-dateedit.c:1357 widgets/misc/e-dateedit.c:1584
+#: widgets/misc/e-dateedit.c:1382 widgets/misc/e-dateedit.c:1609
 msgid "%H:%M"
 msgstr ""
 
@@ -7753,8 +7838,8 @@ msgstr ""
 "��, ���� ������ ���� �����̳׿�.\n"
 "�ڷ� ���ư� ������ ����� ������ �����ϼ���."
 
-#: filter/filter-folder.c:232 filter/vfolder-rule.c:351
-#: mail/mail-account-gui.c:820
+#: filter/filter-folder.c:232 filter/vfolder-rule.c:356
+#: mail/mail-account-gui.c:822
 msgid "Select Folder"
 msgstr "���� ����"
 
@@ -8007,7 +8092,7 @@ msgstr "ȸ��"
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1242
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1251
 msgid "Sender"
 msgstr "������"
 
@@ -8041,7 +8126,7 @@ msgstr ""
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:893
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:917
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "����"
@@ -8072,7 +8157,7 @@ msgstr "���� �̸� ����"
 msgid "Score Rules"
 msgstr ""
 
-#: filter/vfolder-rule.c:203
+#: filter/vfolder-rule.c:206
 msgid "Oops.  You need to to specify at least one folder as a source."
 msgstr ""
 
@@ -8091,7 +8176,7 @@ msgstr "��������"
 msgid "Please wait"
 msgstr ""
 
-#: importers/elm-importer.c:171 importers/netscape-importer.c:701
+#: importers/elm-importer.c:171 importers/netscape-importer.c:708
 #: importers/pine-importer.c:369
 #, fuzzy, c-format
 msgid "Importing %s as %s"
@@ -8099,13 +8184,13 @@ msgstr ""
 "%s�� ��������.\n"
 "%s�� �����մϴ�"
 
-#: importers/elm-importer.c:377 importers/netscape-importer.c:794
+#: importers/elm-importer.c:377 importers/netscape-importer.c:801
 #: importers/pine-importer.c:506
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "\"%s\" ������ ��"
 
-#: importers/elm-importer.c:528 importers/netscape-importer.c:967
+#: importers/elm-importer.c:528 importers/netscape-importer.c:974
 #: importers/pine-importer.c:669 mail/component-factory.c:96
 msgid "Mail"
 msgstr "����"
@@ -8140,22 +8225,22 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: importers/netscape-importer.c:897 importers/pine-importer.c:602
+#: importers/netscape-importer.c:904 importers/pine-importer.c:602
 #, fuzzy
 msgid "Scanning directory"
 msgstr "IMAP ������ ���캾�ϴ�"
 
-#: importers/netscape-importer.c:906
+#: importers/netscape-importer.c:913
 #, fuzzy
 msgid "Starting import"
 msgstr "���� ��¥(_S):"
 
-#: importers/netscape-importer.c:972
+#: importers/netscape-importer.c:979
 #, fuzzy
 msgid "Settings"
 msgstr "����..."
 
-#: importers/netscape-importer.c:993
+#: importers/netscape-importer.c:1000
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -8241,21 +8326,27 @@ msgstr "����(_P)..."
 msgid "Change this folder's properties"
 msgstr ""
 
-#: mail/component-factory.c:790
+#: mail/component-factory.c:698
+msgid ""
+"Some of your mail settings seem corrupt, please check that everything is in "
+"order."
+msgstr ""
+
+#: mail/component-factory.c:812
 #, fuzzy
 msgid "New Mail Message"
 msgstr "���� �޼���(_M)"
 
-#: mail/component-factory.c:790
+#: mail/component-factory.c:812
 #, fuzzy
 msgid "New _Mail Message"
 msgstr "���� �޼���(_M)"
 
-#: mail/component-factory.c:821
+#: mail/component-factory.c:843
 msgid "Cannot initialize Evolution's mail component."
 msgstr ""
 
-#: mail/component-factory.c:1007
+#: mail/component-factory.c:1032
 msgid "Cannot register storage with shell"
 msgstr ""
 
@@ -8268,172 +8359,172 @@ msgstr "\"%s\"������ ����"
 msgid "Properties"
 msgstr "����"
 
-#: mail/folder-browser.c:239 mail/mail-display.c:275
+#: mail/folder-browser.c:262 mail/mail-display.c:275
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "�ӽ� ���丮�� ���� ���� �����ϴ�: %s"
 
-#: mail/folder-browser.c:708
+#: mail/folder-browser.c:734
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/folder-browser.c:711 mail/folder-browser.c:716
-#: mail/folder-browser.c:720
+#: mail/folder-browser.c:737 mail/folder-browser.c:742
+#: mail/folder-browser.c:746
 msgid ", "
 msgstr ""
 
-#: mail/folder-browser.c:712
+#: mail/folder-browser.c:738
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/folder-browser.c:717
+#: mail/folder-browser.c:743
 #, fuzzy, c-format
 msgid "%d selected"
 msgstr "������"
 
-#: mail/folder-browser.c:722
+#: mail/folder-browser.c:748
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr " %d �ʸ���"
 
-#: mail/folder-browser.c:724
+#: mail/folder-browser.c:750
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/folder-browser.c:958
+#: mail/folder-browser.c:993
 #, fuzzy
 msgid "Create vFolder from Search"
 msgstr "�޽����κ��� �Ÿ��� ����(_C)"
 
-#: mail/folder-browser.c:1303
+#: mail/folder-browser.c:1338
 msgid "VFolder on _Subject"
 msgstr "���񿡵��� ��������(_S)"
 
-#: mail/folder-browser.c:1306
+#: mail/folder-browser.c:1341
 msgid "VFolder on Se_nder"
 msgstr "�߼��ڿ����� ��������(_n)"
 
-#: mail/folder-browser.c:1309
+#: mail/folder-browser.c:1344
 msgid "VFolder on _Recipients"
 msgstr "�����ڿ����� ��������(_R)"
 
-#: mail/folder-browser.c:1312
+#: mail/folder-browser.c:1347
 #, fuzzy
 msgid "VFolder on Mailing _List"
 msgstr "���ϸ� ����Ʈ������ ����"
 
-#: mail/folder-browser.c:1318
+#: mail/folder-browser.c:1353
 #, fuzzy
 msgid "Filter on Sub_ject"
 msgstr "���񿡴��� �Ÿ���(_S)"
 
-#: mail/folder-browser.c:1321
+#: mail/folder-browser.c:1356
 #, fuzzy
 msgid "Filter on Sen_der"
 msgstr "�߼��ο����� �Ÿ���(_n)"
 
-#: mail/folder-browser.c:1324
+#: mail/folder-browser.c:1359
 #, fuzzy
 msgid "Filter on Re_cipients"
 msgstr "�����ο����� �Ÿ���(_R)"
 
-#: mail/folder-browser.c:1327
+#: mail/folder-browser.c:1362
 #, fuzzy
 msgid "Filter on _Mailing List"
 msgstr "���ϸ� ����Ʈ������ ����"
 
-#: mail/folder-browser.c:1338 ui/evolution-mail-message.xml.h:89
+#: mail/folder-browser.c:1373 ui/evolution-mail-message.xml.h:89
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "�޼��� �μ�"
 
-#: mail/folder-browser.c:1340 ui/evolution-mail-message.xml.h:97
+#: mail/folder-browser.c:1375 ui/evolution-mail-message.xml.h:97
 msgid "_Save As..."
 msgstr "�ٸ��̸����� ����(_S)..."
 
-#: mail/folder-browser.c:1342
+#: mail/folder-browser.c:1377
 msgid "_Print"
 msgstr "�μ�(_P)"
 
-#: mail/folder-browser.c:1347 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1382 ui/evolution-mail-message.xml.h:96
 #, fuzzy
 msgid "_Reply to Sender"
 msgstr "���� ������� ȸ��"
 
-#: mail/folder-browser.c:1349 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1384 ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Reply to _List"
 msgstr "��ü ȸ��(_A)"
 
-#: mail/folder-browser.c:1351 ui/evolution-mail-message.xml.h:68
+#: mail/folder-browser.c:1386 ui/evolution-mail-message.xml.h:68
 msgid "Reply to _All"
 msgstr "��ü ȸ��(_A)"
 
-#: mail/folder-browser.c:1353
+#: mail/folder-browser.c:1388
 msgid "_Forward"
 msgstr "����(_F)"
 
-#: mail/folder-browser.c:1356 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1391 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "���� ������ ǥ��(_k)"
 
-#: mail/folder-browser.c:1358 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1393 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "���� ���� ������ ǥ��(_n)"
 
-#: mail/folder-browser.c:1360
+#: mail/folder-browser.c:1395
 #, fuzzy
 msgid "Mark as _Important"
 msgstr "�߿�"
 
-#: mail/folder-browser.c:1362
+#: mail/folder-browser.c:1397
 #, fuzzy
 msgid "Mark as Unim_portant"
 msgstr "���� ���� ������ ǥ��"
 
-#: mail/folder-browser.c:1367
+#: mail/folder-browser.c:1402
 msgid "_Move to Folder..."
 msgstr "������ �̵�(_M)..."
 
-#: mail/folder-browser.c:1369
+#: mail/folder-browser.c:1404
 msgid "_Copy to Folder..."
 msgstr "������ ����(_C)..."
 
-#: mail/folder-browser.c:1373 ui/evolution-mail-message.xml.h:99
+#: mail/folder-browser.c:1408 ui/evolution-mail-message.xml.h:99
 msgid "_Undelete"
 msgstr "�ǻ츲(_U)"
 
-#: mail/folder-browser.c:1378
+#: mail/folder-browser.c:1413
 #, fuzzy
 msgid "Add Sender to Address Book"
 msgstr "�ּҷ� �߰�"
 
-#: mail/folder-browser.c:1383
+#: mail/folder-browser.c:1418
 msgid "Apply Filters"
 msgstr "�Ÿ��� ����"
 
-#: mail/folder-browser.c:1387
+#: mail/folder-browser.c:1422
 #, fuzzy
 msgid "Create Ru_le From Message"
 msgstr "�޽����κ��� �Ÿ��� ����(_C)"
 
-#: mail/folder-browser.c:1538
+#: mail/folder-browser.c:1573
 msgid "Filter on Mailing List"
 msgstr "���ϸ� ����Ʈ������ ����"
 
-#: mail/folder-browser.c:1539
+#: mail/folder-browser.c:1574
 msgid "VFolder on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1541
+#: mail/folder-browser.c:1576
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:1542
+#: mail/folder-browser.c:1577
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr ""
@@ -8508,17 +8599,17 @@ msgstr "Evolution ��ġ"
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:945
+#: mail/mail-account-gui.c:947
 #, fuzzy
 msgid "Could not save signature file."
 msgstr "�ӽ� ������ ������ ����: %s"
 
-#: mail/mail-account-gui.c:1022
+#: mail/mail-account-gui.c:1024
 #, fuzzy
 msgid "Save signature"
 msgstr "����:"
 
-#: mail/mail-account-gui.c:1028
+#: mail/mail-account-gui.c:1030
 #, fuzzy
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
@@ -8529,7 +8620,7 @@ msgstr ""
 "\n"
 "����� ������ �����Ͻðڽ��ϱ�?"
 
-#: mail/mail-account-gui.c:1611
+#: mail/mail-account-gui.c:1615
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -8564,7 +8655,7 @@ msgid "Are you sure you want to delete this news account?"
 msgstr "������ �� �� ������ ����⸦ ���Ͻʴϱ�?"
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:757 mail/mail-config.glade.h:42
+#: mail/mail-accounts.c:760 mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Mail Settings"
 msgstr "���� ����(_M)..."
@@ -8656,71 +8747,71 @@ msgstr ""
 msgid "This message contains invalid recipients:"
 msgstr ""
 
-#: mail/mail-callbacks.c:453
+#: mail/mail-callbacks.c:454
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:549
+#: mail/mail-callbacks.c:550
 msgid "You must configure an account before you can send this email."
 msgstr ""
 
-#: mail/mail-callbacks.c:779
+#: mail/mail-callbacks.c:783
 #, fuzzy
 msgid "an unknown sender"
 msgstr "�� ������ ����"
 
-#: mail/mail-callbacks.c:784
+#: mail/mail-callbacks.c:788
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1162
+#: mail/mail-callbacks.c:1171
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1164
+#: mail/mail-callbacks.c:1173
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1538
+#: mail/mail-callbacks.c:1547
 #, fuzzy, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "������ �۾� `%s'�� ����⸦ ���Ͻʴϱ�"
 
-#: mail/mail-callbacks.c:1560
+#: mail/mail-callbacks.c:1569
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1594
+#: mail/mail-callbacks.c:1603
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1606
+#: mail/mail-callbacks.c:1615
 #, fuzzy, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "������ �۾� `%s'�� ����⸦ ���Ͻʴϱ�"
 
-#: mail/mail-callbacks.c:1627
+#: mail/mail-callbacks.c:1636
 #, fuzzy
 msgid "No Message Selected"
 msgstr "�޼����� �޾ҽ��ϴ�"
 
-#: mail/mail-callbacks.c:1712
+#: mail/mail-callbacks.c:1721
 msgid "Save Message As..."
 msgstr "�ٸ��̸����� �޼��� ����..."
 
-#: mail/mail-callbacks.c:1714
+#: mail/mail-callbacks.c:1723
 msgid "Save Messages As..."
 msgstr "�ٸ��̸����� �޼��� ����..."
 
-#: mail/mail-callbacks.c:1859 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:1868 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "���"
 
-#: mail/mail-callbacks.c:1864
+#: mail/mail-callbacks.c:1873
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8728,32 +8819,32 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1871
+#: mail/mail-callbacks.c:1880
 #, fuzzy
 msgid "Do not ask me again."
 msgstr "�� �޼����� �ٽ� �� �� �����ϴ�"
 
-#: mail/mail-callbacks.c:1976
+#: mail/mail-callbacks.c:1985
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:1986
+#: mail/mail-callbacks.c:1995
 #, fuzzy
 msgid "Filters"
 msgstr "���� �Ÿ���(_F)..."
 
-#: mail/mail-callbacks.c:2032
+#: mail/mail-callbacks.c:2041
 msgid "Print Message"
 msgstr "�޼��� �μ�"
 
-#: mail/mail-callbacks.c:2078
+#: mail/mail-callbacks.c:2087
 msgid "Printing of message failed"
 msgstr "�޼��� �μ��� ����"
 
-#: mail/mail-callbacks.c:2162
+#: mail/mail-callbacks.c:2171
 #, fuzzy, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "������ �� �� ������ ����⸦ ���Ͻʴϱ�?"
@@ -8800,89 +8891,109 @@ msgstr ""
 msgid "Evolution Account Assistant"
 msgstr "Evolution ���� ������"
 
-#: mail/mail-config.c:1486
-#, fuzzy
-msgid "Evolution Shortcuts"
-msgstr "Evolution ���� ����(_s)"
+#: mail/mail-config.c:315
+#, fuzzy, c-format
+msgid "Account %d"
+msgstr "����"
 
-#. right now, the URL always works basically as a matter of luck...
-#. * both IMAP and mbox spool stores have INBOX as their inbox folder
-#. * name. I don't think this will work with maildir. How can we figure out
-#. * what shortcut to insert?
-#.
 #: mail/mail-config.c:1618
 #, c-format
+msgid ""
+"Could not get inbox for new mail store:\n"
+"%s\n"
+"No shortcut will be created."
+msgstr ""
+
+#. Create the shortcut. FIXME: This only works if the
+#. * full name matches the path.
+#.
+#: mail/mail-config.c:1629
+#, c-format
 msgid "%s: Inbox"
 msgstr ""
 
-#: mail/mail-config.c:1851
+#: mail/mail-config.c:1873
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:1922 mail/mail-config.c:1925
+#: mail/mail-config.c:1944 mail/mail-config.c:1947
 msgid "Connecting to server..."
 msgstr ""
 
 #: mail/mail-config.glade.h:1
+msgid " _Check for supported types "
+msgstr ""
+
+#: mail/mail-config.glade.h:2
 msgid " color"
 msgstr "����"
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:3
 msgid "(SSL is not supported in this build of evolution)"
 msgstr ""
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr "����"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr "���� ����"
 
-#: mail/mail-config.glade.h:5 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:6 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "���� ����"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "Accounts"
 msgstr "����"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:10
 msgid "Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:10 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "÷��"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:12
 msgid "Authentication"
 msgstr "����:"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Authentication Type: "
 msgstr "���� ����:"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:14
 msgid "Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:16
 #, fuzzy
 msgid "Composer"
 msgstr "���� �ۼ�"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:17
+#, fuzzy
+msgid "Configuration"
+msgstr "���� ����"
+
+#: mail/mail-config.glade.h:18
+#, fuzzy
+msgid "Confirm when Expunging a folder"
+msgstr "���� ����"
+
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -8892,347 +9003,330 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:26
 msgid "Default Forward style is: "
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:27
 msgid "Default character encoding: "
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:29
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:30
 msgid "Display"
 msgstr "ǥ��"
 
-#: mail/mail-config.glade.h:27 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:31 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "�Ϸ�"
 
-#: mail/mail-config.glade.h:28 shell/e-local-storage.c:174
+#: mail/mail-config.glade.h:32 shell/e-local-storage.c:174
 #, fuzzy
 msgid "Drafts"
 msgstr "�ʰ�"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "Drafts folder:"
 msgstr "�� ������ ����"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:34
 msgid "E_nable"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
-#, fuzzy
-msgid "Each account must have a different name."
-msgstr "���� ������ �ٸ��̸����� �����մϴ�"
-
-#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:96
 #: widgets/misc/e-filter-bar.h:103
 #, fuzzy
 msgid "Edit..."
 msgstr "����"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:36
 msgid "Enabled"
 msgstr ""
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:37
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:38
 #, fuzzy
 msgid "HTML signature file:"
 msgstr "����:"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:39
 msgid "IMAPv4 "
 msgstr ""
 
-#: mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:40 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:41
 msgid "In HTML mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Inline"
 msgstr "�ݴ�"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:43
 msgid "Kerberos "
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:44
 msgid "Mail Configuration"
 msgstr "���� ����"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Mailbox location"
 msgstr "���Ϲڽ� ����"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Make this my _default account"
 msgstr "�⺻ �������� �ϱ�"
 
-#: mail/mail-config.glade.h:45
-msgid "Message _preview should be displayed by default"
-msgstr ""
-
-#: mail/mail-config.glade.h:46
-msgid "Message list should display in a _threaded fashion by default"
-msgstr ""
-
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "NNTP Server:"
 msgstr "LDAP ����"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:49
 msgid "News"
 msgstr "����"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Optional Information"
 msgstr "���� ����"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:53
 msgid "PGP Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 msgid "Pick a color"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 msgid "Pretty Good Privacy"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 msgid "Prompt when sending messages with an _empty subject"
 msgstr ""
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:60
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid "Quoted"
 msgstr "�ο�(_Q)"
 
-#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "������ ����"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:63
 #, fuzzy
 msgid "Receiving Mail"
 msgstr "������ ����"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:64
 #, fuzzy
 msgid "Receiving Options"
 msgstr "�޾���"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:65
 #, fuzzy
 msgid "Required Information"
 msgstr "����� ����"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:67
 msgid "Secure MIME"
 msgstr ""
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:68
 #, fuzzy
 msgid "Security"
 msgstr "����(_S)"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Select Filter Log file..."
 msgstr "������ ��������"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:70
 msgid "Select PGP binary"
 msgstr "PGP ���α׷� ������ ����"
 
-#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:71 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "������ ����"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Sending Mail"
 msgstr "������ ����"
 
-#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:74 mail/message-list.etspec.h:6
 #: shell/e-local-storage.c:177
 #, fuzzy
 msgid "Sent"
 msgstr "����"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "�޼������� �ٽ� ������(_R)"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Sent messages folder:"
 msgstr "�޼����� ������ ����"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:77
 msgid "Server Configuration"
 msgstr "���� ����"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 msgid "Server Type: "
 msgstr "���� ����: "
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "Server requires _authentication"
 msgstr "������ ������ �䱸�մϴ�"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:80
 msgid "Signature file:"
 msgstr "���� ����:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "Source"
 msgstr ""
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "Source Information"
 msgstr "���� ����"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:83
 msgid "Sources"
 msgstr ""
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Special Folders"
 msgstr "���� ����"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:85
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:87
 msgid "Use secure connection (_SSL)"
 msgstr ""
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:88
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:92
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:93
 msgid "_Automatically check for new mail every"
 msgstr ""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:94
 msgid "_Check for supported types"
 msgstr ""
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "_Email Address:"
 msgstr "���ڿ��� �ּ�:"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:98
 msgid "_Empty trash folders on exit"
 msgstr ""
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 #, fuzzy
 msgid "_Full Name:"
 msgstr "��ü�̸�:"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "_HTML Signature:"
 msgstr "����:"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 msgid "_Highlight citations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "_Host:"
 msgstr "ȣ��Ʈ:"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 msgid "_Log filter actions to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 #, fuzzy
 msgid "_Mark messages as Read after"
 msgstr "�޼��� �Ӹ���"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 #, fuzzy
 msgid "_Name:"
 msgstr "�̸�:"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 #, fuzzy
 msgid "_Organization:"
 msgstr "����:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:109
 #, fuzzy
 msgid "_PGP binary path:"
 msgstr "PGP ���"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "_Path:"
 msgstr "���:"
 
-#: mail/mail-config.glade.h:110
-msgid "_Remember PGP Passphrase until exit"
-msgstr ""
-
 #: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "_Remember this password"
@@ -9270,44 +9364,44 @@ msgstr ""
 msgid "seconds."
 msgstr "��."
 
-#: mail/mail-crypto.c:60
+#: mail/mail-crypto.c:59
 msgid "Could not create a PGP signature context."
 msgstr ""
 
-#: mail/mail-crypto.c:86
+#: mail/mail-crypto.c:84
 msgid "Could not create a PGP verification context."
 msgstr ""
 
-#: mail/mail-crypto.c:116
+#: mail/mail-crypto.c:113
 #, fuzzy
 msgid "Could not create a PGP encryption context."
 msgstr "�޽��� �ۼ� â�� ���� ���� �����ϴ�"
 
-#: mail/mail-crypto.c:142
+#: mail/mail-crypto.c:138
 #, fuzzy
 msgid "Could not create a PGP decryption context."
 msgstr ""
 "%s ���丮�� ������ ���� �����ϴ�:\n"
 "%s"
 
-#: mail/mail-crypto.c:177
+#: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
 msgstr ""
 
-#: mail/mail-crypto.c:209
+#: mail/mail-crypto.c:205
 msgid "Could not create a S/MIME certsonly context."
 msgstr ""
 
-#: mail/mail-crypto.c:240
+#: mail/mail-crypto.c:236
 msgid "Could not create a S/MIME encryption context."
 msgstr ""
 
-#: mail/mail-crypto.c:271
+#: mail/mail-crypto.c:267
 #, fuzzy
 msgid "Could not create a S/MIME envelope context."
 msgstr "�޽��� �ۼ� â�� ���� ���� �����ϴ�"
 
-#: mail/mail-crypto.c:301
+#: mail/mail-crypto.c:297
 #, fuzzy
 msgid "Could not create a S/MIME decode context."
 msgstr "�޽��� �ۼ� â�� ���� ���� �����ϴ�"
@@ -9355,12 +9449,12 @@ msgstr ""
 msgid "Copy Link Location"
 msgstr "�����Ѱ� ����"
 
-#: mail/mail-display.c:1519
+#: mail/mail-display.c:1520
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "������ ����(_f)... (��ĥ����)"
 
-#: mail/mail-display.c:1521
+#: mail/mail-display.c:1523
 #, fuzzy
 msgid "Save Image as..."
 msgstr "�ٸ� �̸����� ����..."
@@ -9378,138 +9472,138 @@ msgstr ""
 msgid "Date"
 msgstr "��¥"
 
-#: mail/mail-format.c:860
+#: mail/mail-format.c:862
 #, fuzzy
 msgid "Bad Address"
 msgstr "���ڿ��� �ּ�:"
 
-#: mail/mail-format.c:882 mail/message-list.etspec.h:3
+#: mail/mail-format.c:903 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "������"
 
-#: mail/mail-format.c:885
+#: mail/mail-format.c:906
 #, fuzzy
 msgid "Reply-To"
 msgstr "ȸ�� �ּ�:"
 
-#: mail/mail-format.c:888 mail/message-list.etspec.h:10
+#: mail/mail-format.c:910 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "�޴»��"
 
-#: mail/mail-format.c:891
+#: mail/mail-format.c:914
 #, fuzzy
 msgid "Cc"
 msgstr "����:"
 
-#: mail/mail-format.c:1311
+#: mail/mail-format.c:1357
 #, fuzzy
 msgid "No GPG/PGP program configured."
 msgstr "GPG/PGP ���α׷��� �����ϴ�."
 
-#: mail/mail-format.c:1327
+#: mail/mail-format.c:1373
 msgid "Encrypted message not displayed"
 msgstr "��ȣȭ�� �޽����� ����������"
 
-#: mail/mail-format.c:1338
+#: mail/mail-format.c:1384
 msgid "Encrypted message"
 msgstr "��ȣȭ�� �޼���"
 
-#: mail/mail-format.c:1339
+#: mail/mail-format.c:1385
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1394
+#: mail/mail-format.c:1440
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1405
+#: mail/mail-format.c:1451
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2083
+#: mail/mail-format.c:2128
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2097
+#: mail/mail-format.c:2142
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2102
+#: mail/mail-format.c:2147
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2131
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2139
+#: mail/mail-format.c:2184
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2144
+#: mail/mail-format.c:2189
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:547
+#: mail/mail-local.c:563
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "���� �缳��"
 
-#: mail/mail-local.c:620
+#: mail/mail-local.c:636
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:676
+#: mail/mail-local.c:689
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: mail/mail-local.c:722
+#: mail/mail-local.c:735
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: mail/mail-local.c:1052
+#: mail/mail-local.c:1075
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "\"%s\" ������ \"%s\" �������� �ٲٱ�"
 
-#: mail/mail-local.c:1067
+#: mail/mail-local.c:1090
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1089
+#: mail/mail-local.c:1112
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1180
+#: mail/mail-local.c:1200
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-local.c:1190
+#: mail/mail-local.c:1209
 #, fuzzy, c-format
-msgid "Reconfigure %s"
+msgid "Reconfigure /%s"
 msgstr "%s ����"
 
-#: mail/mail-mt.c:188
+#: mail/mail-mt.c:199
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:191
+#: mail/mail-mt.c:202
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -9519,21 +9613,25 @@ msgstr ""
 "%s"
 
 #. Remember the password?
-#: mail/mail-mt.c:454
+#: mail/mail-mt.c:509
 msgid "Remember this password"
 msgstr "�� ��й�ȣ ���"
 
-#: mail/mail-mt.c:511
+#: mail/mail-mt.c:510
+msgid "Remember this password for the remainder of this session"
+msgstr ""
+
+#: mail/mail-mt.c:567
 #, c-format
 msgid "Enter Password for %s"
 msgstr ""
 
-#: mail/mail-mt.c:514
+#: mail/mail-mt.c:570
 #, fuzzy
 msgid "Enter Password"
 msgstr "��й�ȣ"
 
-#: mail/mail-mt.c:824
+#: mail/mail-mt.c:886
 msgid "Working"
 msgstr ""
 
@@ -9691,6 +9789,11 @@ msgstr "����Ÿ�� �� ���� �����ϴ�: %s"
 msgid "Disconnecting from %s"
 msgstr ""
 
+#: mail/mail-ops.c:2065
+#, fuzzy, c-format
+msgid "Reconnecting to %s"
+msgstr "�޾���"
+
 #: mail/mail-search-dialogue.c:113
 msgid "_Search"
 msgstr "�˻�(_S)"
@@ -9754,12 +9857,12 @@ msgstr ""
 msgid "Type: %s"
 msgstr "����:"
 
-#: mail/mail-send-recv.c:282
+#: mail/mail-send-recv.c:283
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "���� �ְ��ޱ�"
 
-#: mail/mail-send-recv.c:283
+#: mail/mail-send-recv.c:284
 #, fuzzy
 msgid "Cancel All"
 msgstr "��ҵ�"
@@ -9783,36 +9886,50 @@ msgstr "��ҵ�."
 msgid "User canceled operation."
 msgstr "����� ����"
 
-#: mail/mail-tools.c:173
+#: mail/mail-tools.c:133
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "�ӽ� mbox `%s'�� ������� �����ϴ�: %s"
 
-#: mail/mail-tools.c:299
+#: mail/mail-tools.c:259
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "���޵� �޽��� - %s"
 
-#: mail/mail-tools.c:303
+#: mail/mail-tools.c:263
 #, fuzzy
 msgid "Forwarded message"
 msgstr "���޵� �޽���"
 
-#: mail/mail-tools.c:439
+#: mail/mail-tools.c:396
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "���޵� �޽���"
 
-#: mail/mail-vfolder.c:161
+#: mail/mail-vfolder.c:84
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "%s ������ ����"
 
-#: mail/mail-vfolder.c:435
+#: mail/mail-vfolder.c:201
+#, fuzzy, c-format
+msgid "Updating vfolders for uri: %s"
+msgstr "%s ������ ����"
+
+#: mail/mail-vfolder.c:414
+#, c-format
+msgid ""
+"The following vFolder(s):\n"
+"%sUsed the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+
+#: mail/mail-vfolder.c:636
 msgid "VFolders"
 msgstr "���� ����"
 
-#: mail/mail-vfolder.c:541
+#: mail/mail-vfolder.c:742
 msgid "New VFolder"
 msgstr "�� ��������"
 
@@ -9882,7 +9999,7 @@ msgstr ""
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:2331
+#: mail/message-list.c:2334
 #, fuzzy
 msgid "Generating message list"
 msgstr "�޽������� ����"
@@ -9974,34 +10091,34 @@ msgstr "���� ����"
 msgid "Evolution component for the executive summary."
 msgstr ""
 
-#: my-evolution/component-factory.c:30
+#: my-evolution/component-factory.c:45
 msgid "Folder containing the Evolution Summary"
 msgstr ""
 
-#: my-evolution/component-factory.c:139
+#: my-evolution/component-factory.c:154
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:248 my-evolution/e-summary-calendar.c:266
+#: my-evolution/e-summary-calendar.c:263 my-evolution/e-summary-calendar.c:281
 #, fuzzy
 msgid "Appointments"
 msgstr "���"
 
-#: my-evolution/e-summary-calendar.c:249
+#: my-evolution/e-summary-calendar.c:264
 #, fuzzy
 msgid "No appointments"
 msgstr "��� ����"
 
-#: my-evolution/e-summary-calendar.c:286
+#: my-evolution/e-summary-calendar.c:301
 msgid "%k%M %d %B"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:288
+#: my-evolution/e-summary-calendar.c:303
 #, fuzzy
 msgid "%l:%M %d %B"
 msgstr "���� %l:%M %p"
 
-#: my-evolution/e-summary-mail.c:115
+#: my-evolution/e-summary-mail.c:130
 #, fuzzy
 msgid "Mail summary"
 msgstr "���"
@@ -10010,90 +10127,90 @@ msgstr "���"
 #. see in My Evolution by default. You can find the list of all
 #. stations and their codes in Evolution sources
 #. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-preferences.c:65
-#: my-evolution/e-summary-weather.c:615
+#: my-evolution/e-summary-preferences.c:80
+#: my-evolution/e-summary-weather.c:630
 msgid "KBOS:ZSAM:EGAA"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:427
+#: my-evolution/e-summary-preferences.c:441
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:449
+#: my-evolution/e-summary-preferences.c:463
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:890
+#: my-evolution/e-summary-preferences.c:929
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:898
+#: my-evolution/e-summary-preferences.c:937
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:902
+#: my-evolution/e-summary-preferences.c:941
 msgid "Name:"
 msgstr "�̸�:"
 
-#: my-evolution/e-summary-preferences.c:1438
+#: my-evolution/e-summary-preferences.c:1486
 #, fuzzy
 msgid "Summary Settings"
 msgstr "���� ����(_M)..."
 
-#: my-evolution/e-summary-rdf.c:277 my-evolution/e-summary-rdf.c:362
-#: my-evolution/e-summary-rdf.c:395
+#: my-evolution/e-summary-rdf.c:297 my-evolution/e-summary-rdf.c:382
+#: my-evolution/e-summary-rdf.c:415
 #, fuzzy
 msgid "Error downloading RDF"
 msgstr "<b>�޷¸� �д��� ����</b>"
 
-#: my-evolution/e-summary-rdf.c:487
+#: my-evolution/e-summary-rdf.c:507
 #, fuzzy
 msgid "News Feed"
 msgstr "�� ��������(_N)"
 
-#: my-evolution/e-summary-tasks.c:216
+#: my-evolution/e-summary-tasks.c:238
 #, fuzzy
 msgid "No tasks"
 msgstr "����"
 
-#: my-evolution/e-summary-tasks.c:255
+#: my-evolution/e-summary-tasks.c:277
 #, fuzzy
 msgid "(No Description)"
 msgstr "����:"
 
-#: my-evolution/e-summary-weather.c:57
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:334
+#: my-evolution/e-summary-weather.c:349
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:524
+#: my-evolution/e-summary-weather.c:539
 #, fuzzy
 msgid "Weather"
 msgstr "��Ÿ"
 
-#: my-evolution/e-summary-weather.c:676
+#: my-evolution/e-summary-weather.c:691
 #, fuzzy
 msgid "Regions"
 msgstr "����:"
 
-#: my-evolution/e-summary.c:162
+#: my-evolution/e-summary.c:187
 msgid "%A, %B %e %Y"
 msgstr ""
 
-#: my-evolution/e-summary.c:512 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:568 ui/my-evolution.xml.h:3
 #, fuzzy
 msgid "Print Summary"
 msgstr "���"
 
-#: my-evolution/e-summary.c:558
+#: my-evolution/e-summary.c:614
 #, fuzzy
 msgid "Printing of Summary failed"
 msgstr "�޼��� �μ��� ����"
 
-#: my-evolution/main.c:52
+#: my-evolution/main.c:67
 #, fuzzy
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
@@ -11529,77 +11646,76 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:174
+#: shell/e-shell-folder-commands.c:176
 #, fuzzy
 msgid "Cannot move a folder over itself."
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:178
 #, fuzzy
 msgid "Cannot copy a folder over itself."
 msgstr ""
 "`%s'�� ������\n"
 "������ ���� �����ϴ�."
 
-#: shell/e-shell-folder-commands.c:190
+#: shell/e-shell-folder-commands.c:192
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:294
+#: shell/e-shell-folder-commands.c:312
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:299
+#: shell/e-shell-folder-commands.c:317
 #, fuzzy
 msgid "Copy folder"
 msgstr "������ ����"
 
-#: shell/e-shell-folder-commands.c:337
+#: shell/e-shell-folder-commands.c:359
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:342
+#: shell/e-shell-folder-commands.c:364
 #, fuzzy
 msgid "Move folder"
 msgstr "������ �̵�"
 
-#: shell/e-shell-folder-commands.c:367
+#: shell/e-shell-folder-commands.c:390
 #, fuzzy, c-format
 msgid ""
 "Cannot delete folder:\n"
 "%s"
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: shell/e-shell-folder-commands.c:383
+#: shell/e-shell-folder-commands.c:406
 #, fuzzy, c-format
-msgid "Delete folder '%s'"
-msgstr "���� ����"
+msgid "Delete \"%s\""
+msgstr "����"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:393
+#: shell/e-shell-folder-commands.c:416
 #, fuzzy, c-format
-msgid "Are you sure you want to remove the '%s' folder?"
+msgid "Are you sure you want to remove the \"%s\" folder?"
 msgstr "������ �۾� `%s'�� ����⸦ ���Ͻʴϱ�"
 
-#. Popup a dialog asking what the user would like to rename
-#. the folder to
-#: shell/e-shell-folder-commands.c:468
+#: shell/e-shell-folder-commands.c:470
 #, fuzzy, c-format
-msgid "Rename folder '%s'"
+msgid ""
+"Cannot rename folder:\n"
+"%s"
+msgstr "������ ������ �����ϴ�: %s: %s"
+
+#: shell/e-shell-folder-commands.c:503
+#, fuzzy, c-format
+msgid "Rename the \"%s\" folder to:"
 msgstr "%s ������ ����"
 
-#: shell/e-shell-folder-commands.c:472
+#: shell/e-shell-folder-commands.c:506
 #, fuzzy
-msgid "Rename"
-msgstr "��Ģ �̸�: "
-
-#. Make, pack the label
-#: shell/e-shell-folder-commands.c:480
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "���� �̸�:"
+msgid "Rename folder"
+msgstr "%s ������ ����"
 
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
@@ -11639,13 +11755,13 @@ msgstr "�����Ͻ� ������ �̸��� ���������ʽ��ϴ�"
 msgid "Evolution - Create new folder"
 msgstr "Evolution - �� ���� ����"
 
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:99
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:348
+#: shell/e-shell-folder-selection-dialog.c:360
 msgid "New..."
 msgstr "���ο�..."
 
@@ -11653,7 +11769,11 @@ msgstr "���ο�..."
 msgid "(Untitled)"
 msgstr "(�������)"
 
-#: shell/e-shell-importer.c:102
+#: shell/e-shell-importer.c:141
+msgid "Choose the type of importer to run"
+msgstr ""
+
+#: shell/e-shell-importer.c:144
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -11662,9 +11782,13 @@ msgid ""
 "to work it out."
 msgstr ""
 
+#: shell/e-shell-importer.c:150
+msgid "Please select the information that you would like to import"
+msgstr ""
+
 #. Importer isn't ready yet.
 #. Wait 5 seconds and try again.
-#: shell/e-shell-importer.c:197
+#: shell/e-shell-importer.c:242
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11672,7 +11796,7 @@ msgid ""
 "Waiting 5 seconds to retry."
 msgstr ""
 
-#: shell/e-shell-importer.c:217 shell/e-shell-importer.c:248
+#: shell/e-shell-importer.c:262 shell/e-shell-importer.c:293
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11681,16 +11805,16 @@ msgstr ""
 "%s�� �������� ��\n"
 "������ %d�� ������."
 
-#: shell/e-shell-importer.c:351
+#: shell/e-shell-importer.c:396
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "���� `%s'�� �������� �ʽ��ϴ�."
 
-#: shell/e-shell-importer.c:363
+#: shell/e-shell-importer.c:408
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:378
+#: shell/e-shell-importer.c:423
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -11699,11 +11823,11 @@ msgstr ""
 "������ ������ ���ִ� ������ �����ϴ�\n"
 "%s"
 
-#: shell/e-shell-importer.c:388
+#: shell/e-shell-importer.c:433
 msgid "Importing"
 msgstr "��������"
 
-#: shell/e-shell-importer.c:396
+#: shell/e-shell-importer.c:441
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -11712,17 +11836,17 @@ msgstr ""
 "%s�� ��������.\n"
 "%s�� �����մϴ�"
 
-#: shell/e-shell-importer.c:409
+#: shell/e-shell-importer.c:454
 #, fuzzy, c-format
 msgid "Error starting %s"
 msgstr "%s��(��) �д��� ���� �߻�"
 
-#: shell/e-shell-importer.c:428
+#: shell/e-shell-importer.c:473
 #, c-format
 msgid "Error loading %s"
 msgstr "%s��(��) �д��� ���� �߻�"
 
-#: shell/e-shell-importer.c:445
+#: shell/e-shell-importer.c:490
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11731,32 +11855,56 @@ msgstr ""
 "%s�� �������� ��\n"
 "������ 1�� ������."
 
-#: shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:560
 msgid "Automatic"
 msgstr "�ڵ�"
 
-#: shell/e-shell-importer.c:566
+#: shell/e-shell-importer.c:611
 msgid "Filename:"
 msgstr "���� �̸�:"
 
-#: shell/e-shell-importer.c:571
+#: shell/e-shell-importer.c:616
 msgid "Select a file"
 msgstr "������ ��������"
 
-#: shell/e-shell-importer.c:581
+#: shell/e-shell-importer.c:626
 msgid "File type:"
 msgstr "���� ����:"
 
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:651
+msgid "Import data and settings from older programs"
+msgstr ""
+
+#: shell/e-shell-importer.c:655
+#, fuzzy
+msgid "Import a single file"
+msgstr "��������"
+
+#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:582
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:585
+msgid "Starting Intelligent Importers"
+msgstr ""
+
+#: shell/e-shell-importer.c:840 shell/e-shell-startup-wizard.c:703
+#, fuzzy, c-format
+msgid "From %s:"
+msgstr "���� ���:"
+
+#: shell/e-shell-importer.c:1003
 #, fuzzy
 msgid "Select folder"
 msgstr "���� ����"
 
-#: shell/e-shell-importer.c:646
+#: shell/e-shell-importer.c:1004
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:689 shell/importer/intelligent.c:194
+#: shell/e-shell-importer.c:1116 shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "��������"
 
@@ -11776,45 +11924,30 @@ msgstr ""
 msgid "Cannot initialize the Evolution Mailer Wizard interface"
 msgstr "Evolution �ۼ��Ⱑ �ʱ�ȭ���� �ʾҽ��ϴ�."
 
-#: shell/e-shell-startup-wizard.c:582
-msgid ""
-"Please wait...\n"
-"Scanning for existing setups"
-msgstr ""
-
-#: shell/e-shell-startup-wizard.c:585
-msgid "Starting Intelligent Importers"
-msgstr ""
-
-#: shell/e-shell-startup-wizard.c:703
-#, fuzzy, c-format
-msgid "From %s:"
-msgstr "���� ���:"
-
 #: shell/e-shell-startup-wizard.c:745
 msgid ""
 "Please select the information\n"
 "that you would like to import"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:183
+#: shell/e-shell-view-menu.c:201
 msgid "Bug buddy was not found in your $PATH."
 msgstr "�ý����� ��ο� Bug buddy�� ã���� �����ϴ�."
 
-#: shell/e-shell-view-menu.c:191
+#: shell/e-shell-view-menu.c:209
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy�� �����Ҽ� �����ϴ�."
 
-#: shell/e-shell-view-menu.c:217
+#: shell/e-shell-view-menu.c:235
 #, fuzzy
 msgid "Ximian Evolution"
 msgstr "Evolution��..."
 
-#: shell/e-shell-view-menu.c:219
+#: shell/e-shell-view-menu.c:237
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:221
+#: shell/e-shell-view-menu.c:239
 #, fuzzy
 msgid ""
 "Ximian Evolution is a suite of groupware applications\n"
@@ -11825,29 +11958,38 @@ msgstr ""
 "����, ����ó ������ �ϴ� �׷���� �������α׷�\n"
 "���� �Դϴ�."
 
-#: shell/e-shell-view-menu.c:424
+#: shell/e-shell-view-menu.c:442
 msgid "Go to folder..."
 msgstr "���� �̵�..."
 
-#: shell/e-shell-view-menu.c:425
+#: shell/e-shell-view-menu.c:443
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:570
+#: shell/e-shell-view-menu.c:563
 #, fuzzy
 msgid "Create a new shortcut"
 msgstr "�� ����׷��� ����"
 
-#: shell/e-shell-view-menu.c:571
+#: shell/e-shell-view-menu.c:564
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:685
+#: shell/e-shell-view-menu.c:595
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:603
+#, fuzzy, c-format
+msgid "Error executing %s."
+msgstr "���� ������ ����: %s: %s"
+
+#: shell/e-shell-view-menu.c:705
 #, fuzzy
 msgid "Work Online"
 msgstr "�������ο��� �۾�"
 
-#: shell/e-shell-view-menu.c:698 shell/e-shell-view-menu.c:711
+#: shell/e-shell-view-menu.c:718 shell/e-shell-view-menu.c:731
 #: ui/evolution.xml.h:30
 msgid "Work Offline"
 msgstr "�������ο��� �۾�"
@@ -11856,46 +11998,46 @@ msgstr "�������ο��� �۾�"
 msgid "(No folder displayed)"
 msgstr "(ǥ�õ� ������ ����)"
 
-#: shell/e-shell-view.c:1478
+#: shell/e-shell-view.c:1512
 #, c-format
 msgid "%s (%d)"
 msgstr ""
 
-#: shell/e-shell-view.c:1480
+#: shell/e-shell-view.c:1514
 #, fuzzy
 msgid "(None)"
 msgstr "(�̸� ����)"
 
-#: shell/e-shell-view.c:1485
+#: shell/e-shell-view.c:1519
 #, c-format
 msgid "%s - Ximian Evolution %s"
 msgstr ""
 
-#: shell/e-shell-view.c:1487
+#: shell/e-shell-view.c:1521
 #, c-format
 msgid "%s - Ximian Evolution %s [%s]"
 msgstr ""
 
-#: shell/e-shell-view.c:1527
+#: shell/e-shell-view.c:1561
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1534
+#: shell/e-shell-view.c:1568
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1540
+#: shell/e-shell-view.c:1574
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:560
+#: shell/e-shell.c:562
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "�ý��� ������ġ�� �����Ҽ� �����ϴ� -- %s"
 
-#: shell/e-shell.c:1496
+#: shell/e-shell.c:1488
 #, fuzzy, c-format
 msgid ""
 "Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
@@ -11904,24 +12046,24 @@ msgstr ""
 "��!! `%s' �䰡 ���� ���� �׾��׿� :-(\n"
 "%s ������Ʈ�� ����ϽŰ� �����ϴ�."
 
-#: shell/e-shell.c:1700 widgets/misc/e-cell-date-edit.c:248
+#: shell/e-shell.c:1692 widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "Ȯ��"
 
-#: shell/e-shell.c:1702
+#: shell/e-shell.c:1694
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:1704
+#: shell/e-shell.c:1696
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:1706
+#: shell/e-shell.c:1698
 #, fuzzy
 msgid "Configuration Database not found"
 msgstr "���� ���� Druid"
 
-#: shell/e-shell.c:1708 shell/e-storage.c:491
+#: shell/e-shell.c:1700 shell/e-storage.c:496
 msgid "Generic error"
 msgstr "�Ϲ� ����"
 
@@ -12057,52 +12199,59 @@ msgstr ""
 msgid "Shortcuts"
 msgstr "���� ����(_S)"
 
+#: shell/e-storage-set-view.c:645
+#, fuzzy, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr "������ ������ �����ϴ�: %s: %s"
+
 #: shell/e-storage.c:182 shell/e-storage.c:188
 msgid "(No name)"
 msgstr "(�̸� ����)"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:494
 msgid "No error"
 msgstr "���� ����"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:498
 msgid "A folder with the same name already exists"
 msgstr "���� �̸��� ������ �̹� �����մϴ�"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:500
 msgid "The specified folder type is not valid"
 msgstr "������ ���� ������ �ùٸ��� �ʽ��ϴ�"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:502
 msgid "I/O error"
 msgstr "����� ����"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:504
 msgid "Not enough space to create the folder"
 msgstr "������ ����⿡ ����� ������ ����"
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:506
 msgid "The specified folder was not found"
 msgstr "������ ������ ã���� �����ϴ�"
 
-#: shell/e-storage.c:503
+#: shell/e-storage.c:508
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:512
 msgid "Operation not supported"
 msgstr "�۵��� �������� ����"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:514
 msgid "The specified type is not supported in this storage"
 msgstr "�� �����ü�� ������ ������ �������� �ʽ��ϴ�"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:516
 #, fuzzy
 msgid "The specified folder cannot be modified or removed"
 msgstr "������ ������ ã���� �����ϴ�"
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:518
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
@@ -12134,6 +12283,10 @@ msgstr "ȣ��Ʈ:"
 msgid "The following connections are currently active:"
 msgstr ""
 
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr "���� �̸�:"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder type:"
 msgstr "���� ����:"
@@ -12190,15 +12343,25 @@ msgid "Evolution Importer Assistant"
 msgstr "Evolution ��ġ"
 
 #: shell/importer/import.glade.h:4
-msgid "Import File (Step 2 of 2)"
-msgstr ""
+#, fuzzy
+msgid "Import File (step 3 of 3)"
+msgstr "������ ��������"
 
 #: shell/importer/import.glade.h:5
+msgid "Importer Type (step 1 of 3)"
+msgstr ""
+
+#: shell/importer/import.glade.h:6
 #, fuzzy
-msgid "Select a File (step 1 of 2)"
+msgid "Select Importers (step 2 of 3)"
 msgstr "������ ��������"
 
-#: shell/importer/import.glade.h:6
+#: shell/importer/import.glade.h:7
+#, fuzzy
+msgid "Select a File (step 2 of 3)"
+msgstr "������ ��������"
+
+#: shell/importer/import.glade.h:8
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of\n"
@@ -12420,13 +12583,6 @@ msgstr "����ó ã��(_S)"
 msgid "_Select All"
 msgstr "���� ����(_S)"
 
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:44
-#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
-#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:19
-#: ui/my-evolution.xml.h:9
-msgid "_Tools"
-msgstr "����(_T)"
-
 #: ui/evolution-calendar.xml.h:2
 msgid "Configure the calendar's settings"
 msgstr ""
@@ -12620,8 +12776,8 @@ 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:49
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:36
 msgid "_File"
 msgstr "����(_F)"
@@ -12642,8 +12798,8 @@ msgstr "����� �������� ���̾�α׸� �ݴ´�"
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:54
-#: ui/evolution-signature-editor.xml.h:11
+#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Save"
 msgstr "����(_S)"
 
@@ -13310,6 +13466,11 @@ msgstr "ǥ��"
 msgid "_Open Message"
 msgstr "�޼������� �ٽ� ������(_R)"
 
+#: ui/evolution-mail-message.xml.h:98 ui/evolution.xml.h:49
+#: ui/my-evolution.xml.h:9
+msgid "_Tools"
+msgstr "����(_T)"
+
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "�� â�� �ݽ��ϴ�"
@@ -13321,8 +13482,8 @@ msgstr "�� â�� �ݽ��ϴ�"
 msgid "_Close"
 msgstr "�ݱ�(_C)"
 
-#: ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:48
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:50
 msgid "_View"
 msgstr "����(_V)"
 
@@ -13489,37 +13650,32 @@ msgid "_Cc Field"
 msgstr "���� �׸�(_C)"
 
 #: ui/evolution-message-composer.xml.h:46
-#: ui/evolution-signature-editor.xml.h:6
-msgid "_Debug"
-msgstr "�����(_D)"
-
-#: ui/evolution-message-composer.xml.h:47
 #, fuzzy
 msgid "_Delete all"
 msgstr "����(_D)"
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:49
 msgid "_From Field"
 msgstr "�߽� �׸�(_F)"
 
-#: ui/evolution-message-composer.xml.h:51
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-signature-editor.xml.h:9
 msgid "_Insert"
 msgstr "����(_I)"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:51
 msgid "_Open..."
 msgstr "����(_O)..."
 
-#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Reply-To Field"
 msgstr "ȸ�� �ּ� �׸�(_R)"
 
-#: ui/evolution-message-composer.xml.h:55
+#: ui/evolution-message-composer.xml.h:54
 msgid "_Security"
 msgstr "����(_S)"
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "����(_H)"
 
@@ -13668,7 +13824,7 @@ msgid "Exit the program"
 msgstr "���α׷��� ��Ĩ�ϴ�"
 
 #: ui/evolution.xml.h:15
-msgid "Import an external file format"
+msgid "Import data from other programs"
 msgstr ""
 
 #: ui/evolution.xml.h:17
@@ -13748,8 +13904,8 @@ msgstr "������ ����(_G)..."
 
 #: ui/evolution.xml.h:41
 #, fuzzy
-msgid "_Import File..."
-msgstr "������ ����(_G)..."
+msgid "_Import..."
+msgstr "��������"
 
 #: ui/evolution.xml.h:42
 #, fuzzy
@@ -13766,19 +13922,24 @@ msgstr "�� ��������(_N)"
 
 #: ui/evolution.xml.h:45
 #, fuzzy
+msgid "_Pilot Settings..."
+msgstr "���� ����(_M)..."
+
+#: ui/evolution.xml.h:46
+#, fuzzy
 msgid "_Rename..."
 msgstr "����(_O)..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:47
 #, fuzzy
 msgid "_Shortcut"
 msgstr "���� ����(_S)"
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:48
 msgid "_Shortcut Bar"
 msgstr "���� ����(_S)"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:51
 #, fuzzy
 msgid "_Work Offline"
 msgstr "�������ο��� �۾�"
@@ -13890,11 +14051,11 @@ msgstr ""
 msgid "%B %Y"
 msgstr ""
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:433
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:439
 msgid "Now"
 msgstr "����"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:445
 msgid "Today"
 msgstr "����"
 
@@ -14045,21 +14206,56 @@ msgstr "���ο� �ּҷ� ����"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr ""
 
-#: wombat/wombat.c:175
+#: wombat/wombat.c:176
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): GNOME-VFS�� �ʱ�ȭ �� �� �����ϴ�"
 
-#: wombat/wombat.c:187
+#: wombat/wombat.c:188
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): �׳��� �ʱ�ȭ �� �� �����ϴ�"
 
-#: wombat/wombat.c:200
+#: wombat/wombat.c:201
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
 
 #, fuzzy
-#~ msgid "Cannot open folder: %s: No such folder"
-#~ msgstr "������ ������ �����ϴ�: %s: %s"
+#~ msgid "_Calendar Information:"
+#~ msgstr "����� ����"
+
+#, fuzzy
+#~ msgid "before start of appointment"
+#~ msgstr "��ӽ�����"
+
+#, fuzzy
+#~ msgid "after start of appointment"
+#~ msgstr "��� ������"
+
+#, fuzzy
+#~ msgid "before end of appointment"
+#~ msgstr "��� ��������"
+
+#, fuzzy
+#~ msgid "Evolution Shortcuts"
+#~ msgstr "Evolution ���� ����(_s)"
+
+#, fuzzy
+#~ msgid "Each account must have a different name."
+#~ msgstr "���� ������ �ٸ��̸����� �����մϴ�"
+
+#, fuzzy
+#~ msgid "Delete folder '%s'"
+#~ msgstr "���� ����"
+
+#, fuzzy
+#~ msgid "Rename"
+#~ msgstr "��Ģ �̸�: "
+
+#~ msgid "_Debug"
+#~ msgstr "�����(_D)"
+
+#, fuzzy
+#~ msgid "_Import File..."
+#~ msgstr "������ ����(_G)..."
 
 #, fuzzy
 #~ msgid "Done."
@@ -14433,9 +14629,6 @@ msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
 #~ msgid "Renaming old folder and opening"
 #~ msgstr "���� ������ �ٸ� �̸����� �ٲپ ����"
 
-#~ msgid "Copying messages"
-#~ msgstr "�޼��� ����"
-
 #~ msgid "Do you accept?"
 #~ msgstr "�޾Ƶ��̰ڽ��ϱ�?"
 
diff --git a/po/lt.po b/po/lt.po
index cdc16b84d6..7c4f38c101 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.14\n"
-"POT-Creation-Date: 2001-09-11 18:40+0200\n"
+"POT-Creation-Date: 2001-10-01 19:06-0400\n"
 "PO-Revision-Date: 2001-09-23 16:46+0200\n"
 "Last-Translator: Gediminas Paulauskas <menesis@delfi.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -31,245 +31,250 @@ msgid "Name"
 msgstr "Vardas"
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-msgid "Family Name"
-msgstr "Pavard�"
-
-#: addressbook/backend/ebook/e-card-simple.c:61
 #: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Email"
 msgstr "El. pa�tas"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/contact-editor/e-contact-editor.c:1581
+#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/gui/contact-editor/e-contact-editor.c:1609
 msgid "Primary"
 msgstr "Pagrindinis"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:61
 msgid "Prim"
 msgstr "Pagr"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/contact-editor/e-contact-editor.c:1566
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/gui/contact-editor/e-contact-editor.c:1594
 #: addressbook/gui/widgets/e-addressbook-view.c:902
 msgid "Assistant"
 msgstr "Asistento"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/contact-editor/e-contact-editor.c:1567
-#: addressbook/gui/contact-editor/e-contact-editor.c:1634
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/gui/contact-editor/e-contact-editor.c:1595
+#: addressbook/gui/contact-editor/e-contact-editor.c:1662
 msgid "Business"
 msgstr "Darbo"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/backend/ebook/e-card-simple.c:68
 msgid "Bus"
 msgstr "Darbo"
 
-#: addressbook/backend/ebook/e-card-simple.c:65
-#: addressbook/gui/contact-editor/e-contact-editor.c:1570
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:1598
 msgid "Callback"
 msgstr "Atsakiklis"
 
-#: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1572
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/gui/contact-editor/e-contact-editor.c:1600
 msgid "Company"
 msgstr "Kompanijos"
 
-#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:65
 msgid "Comp"
 msgstr "Komp"
 
-#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/e-contact-editor.c:1573
-#: addressbook/gui/contact-editor/e-contact-editor.c:1635
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/contact-editor/e-contact-editor.c:1601
+#: addressbook/gui/contact-editor/e-contact-editor.c:1663
 msgid "Home"
 msgstr "Nam�"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:67
 #: addressbook/gui/widgets/e-addressbook-view.c:877
 msgid "Organization"
 msgstr "Organizacija"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:67
 msgid "Org"
 msgstr "Org"
 
-#: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/e-contact-editor.c:1577
+#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/gui/contact-editor/e-contact-editor.c:1605
 msgid "Mobile"
 msgstr "Mobilus"
 
-#: addressbook/backend/ebook/e-card-simple.c:72
-#: addressbook/gui/contact-editor/e-contact-editor.c:1571
+#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/gui/contact-editor/e-contact-editor.c:1599
 msgid "Car"
 msgstr "Automobilio"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1569
+#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/gui/contact-editor/e-contact-editor.c:1597
 #: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "Business Fax"
 msgstr "Darbo faksas"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/backend/ebook/e-card-simple.c:72
 msgid "Bus Fax"
 msgstr "Darbo faks"
 
-#: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/e-contact-editor.c:1575
+#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/gui/contact-editor/e-contact-editor.c:1603
 #: addressbook/gui/widgets/e-addressbook-view.c:883
 msgid "Home Fax"
 msgstr "Nam� faksas"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1568
+#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/gui/contact-editor/e-contact-editor.c:1596
 msgid "Business 2"
 msgstr "Darbo 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/backend/ebook/e-card-simple.c:74
 msgid "Bus 2"
 msgstr "Darbo 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1574
+#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/gui/contact-editor/e-contact-editor.c:1602
 msgid "Home 2"
 msgstr "Nam� 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1576
+#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/gui/contact-editor/e-contact-editor.c:1604
 #: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/contact-editor/e-contact-editor.c:1578
-#: addressbook/gui/contact-editor/e-contact-editor.c:1636
-#: mail/mail-config.glade.h:51
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/gui/contact-editor/e-contact-editor.c:1606
+#: addressbook/gui/contact-editor/e-contact-editor.c:1664
+#: mail/mail-config.glade.h:52
 msgid "Other"
 msgstr "Kitas"
 
-#: addressbook/backend/ebook/e-card-simple.c:79
-#: addressbook/gui/contact-editor/e-contact-editor.c:1579
+#: addressbook/backend/ebook/e-card-simple.c:78
+#: addressbook/gui/contact-editor/e-contact-editor.c:1607
 #: addressbook/gui/widgets/e-addressbook-view.c:888
 msgid "Other Fax"
 msgstr "Kitas faksas"
 
-#: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1580
+#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/gui/contact-editor/e-contact-editor.c:1608
 #: addressbook/gui/widgets/e-addressbook-view.c:889
 msgid "Pager"
 msgstr "Ie�kas"
 
-#: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1582
+#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/gui/contact-editor/e-contact-editor.c:1610
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1583
+#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/gui/contact-editor/e-contact-editor.c:1611
 #: addressbook/gui/widgets/e-addressbook-view.c:891
 msgid "Telex"
 msgstr "Teleksas"
 
-#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/backend/ebook/e-card-simple.c:82
 #: addressbook/gui/widgets/e-addressbook-view.c:892
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/backend/ebook/e-card-simple.c:84
 #: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1609
+#: addressbook/gui/contact-editor/e-contact-editor.c:1637
 #: addressbook/gui/widgets/e-addressbook-view.c:894
 msgid "Email 2"
 msgstr "El. pa�tas 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/backend/ebook/e-card-simple.c:85
 #: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1610
+#: addressbook/gui/contact-editor/e-contact-editor.c:1638
 #: addressbook/gui/widgets/e-addressbook-view.c:895
 msgid "Email 3"
 msgstr "El. pa�tas 3"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/widgets/e-addressbook-view.c:896
 msgid "Web Site"
 msgstr "Tinklapis"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:86
 msgid "Url"
 msgstr "Url"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/widgets/e-addressbook-view.c:897
 msgid "Department"
 msgstr "Departamentas"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:87
 msgid "Dep"
 msgstr "Dep"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/backend/ebook/e-card-simple.c:88
 #: addressbook/gui/widgets/e-addressbook-view.c:898
 msgid "Office"
 msgstr "Ofisas"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/backend/ebook/e-card-simple.c:88
 #, fuzzy
 msgid "Off"
 msgstr "Ofisas"
 
-#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card-simple.c:89
 #: addressbook/gui/widgets/e-addressbook-view.c:899
 msgid "Title"
 msgstr "Titulas"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:90
 #: addressbook/gui/widgets/e-addressbook-view.c:900
 msgid "Profession"
 msgstr "Profesija"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Prof"
 msgstr "Prof"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:91
 #: addressbook/gui/widgets/e-addressbook-view.c:901
 msgid "Manager"
 msgstr "Vadybininkas"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:91
 #, fuzzy
 msgid "Man"
 msgstr "Gegu��"
 
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:92
 msgid "Ass"
 msgstr "Asist"
 
-#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card-simple.c:93
 #: addressbook/gui/widgets/e-addressbook-view.c:903
 msgid "Nickname"
 msgstr "Pravard�"
 
-#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card-simple.c:93
 #, fuzzy
 msgid "Nick"
 msgstr "Pravard�"
 
-#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/backend/ebook/e-card-simple.c:94
 #: addressbook/gui/widgets/e-addressbook-view.c:904
 msgid "Spouse"
 msgstr "Sutuoktinis"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card-simple.c:95
 #: addressbook/gui/widgets/e-addressbook-view.c:905
 msgid "Note"
 msgstr "Pastaba"
 
+#: addressbook/backend/ebook/e-card-simple.c:96
+#, fuzzy
+msgid "Calendar URI"
+msgstr "Kalendorius"
+
+#: addressbook/backend/ebook/e-card-simple.c:96
+msgid "CALUri"
+msgstr ""
+
 #: addressbook/backend/ebook/e-card-simple.c:97
 #: addressbook/gui/widgets/e-addressbook-view.c:906
 msgid "Free-busy URL"
@@ -296,11 +301,15 @@ msgstr "Gimimo data"
 msgid "Categories"
 msgstr "Kategorijos"
 
-#: addressbook/backend/ebook/e-card.c:3684
+#: addressbook/backend/ebook/e-card-simple.c:103
+msgid "Family Name"
+msgstr "Pavard�"
+
+#: addressbook/backend/ebook/e-card.c:3564
 msgid "Card: "
 msgstr "Kortel�: "
 
-#: addressbook/backend/ebook/e-card.c:3686
+#: addressbook/backend/ebook/e-card.c:3566
 msgid ""
 "\n"
 "Name: "
@@ -308,7 +317,7 @@ msgstr ""
 "\n"
 "Vardas: "
 
-#: addressbook/backend/ebook/e-card.c:3687
+#: addressbook/backend/ebook/e-card.c:3567
 msgid ""
 "\n"
 "  Prefix:     "
@@ -316,7 +325,7 @@ msgstr ""
 "\n"
 "  Prie�d�lis: "
 
-#: addressbook/backend/ebook/e-card.c:3688
+#: addressbook/backend/ebook/e-card.c:3568
 msgid ""
 "\n"
 "  Given:      "
@@ -324,7 +333,7 @@ msgstr ""
 "\n"
 "  Vardas:     "
 
-#: addressbook/backend/ebook/e-card.c:3689
+#: addressbook/backend/ebook/e-card.c:3569
 msgid ""
 "\n"
 "  Additional: "
@@ -332,7 +341,7 @@ msgstr ""
 "\n"
 "  Papildomas: "
 
-#: addressbook/backend/ebook/e-card.c:3690
+#: addressbook/backend/ebook/e-card.c:3570
 msgid ""
 "\n"
 "  Family:     "
@@ -340,7 +349,7 @@ msgstr ""
 "\n"
 "  Pavard�:    "
 
-#: addressbook/backend/ebook/e-card.c:3691
+#: addressbook/backend/ebook/e-card.c:3571
 msgid ""
 "\n"
 "  Suffix:     "
@@ -348,7 +357,7 @@ msgstr ""
 "\n"
 "  Gal�n�:     "
 
-#: addressbook/backend/ebook/e-card.c:3705
+#: addressbook/backend/ebook/e-card.c:3585
 msgid ""
 "\n"
 "Birth Date: "
@@ -356,7 +365,7 @@ msgstr ""
 "\n"
 "Gimimo data:"
 
-#: addressbook/backend/ebook/e-card.c:3716
+#: addressbook/backend/ebook/e-card.c:3596
 msgid ""
 "\n"
 "Address:"
@@ -364,7 +373,7 @@ msgstr ""
 "\n"
 "Adresas:"
 
-#: addressbook/backend/ebook/e-card.c:3718
+#: addressbook/backend/ebook/e-card.c:3598
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -372,13 +381,13 @@ msgstr ""
 "\n"
 "  Pa�to d���:  "
 
-#: addressbook/backend/ebook/e-card.c:3719
+#: addressbook/backend/ebook/e-card.c:3599
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3720
+#: addressbook/backend/ebook/e-card.c:3600
 msgid ""
 "\n"
 "  Street:      "
@@ -386,7 +395,7 @@ msgstr ""
 "\n"
 "  Gatv�:       "
 
-#: addressbook/backend/ebook/e-card.c:3721
+#: addressbook/backend/ebook/e-card.c:3601
 msgid ""
 "\n"
 "  City:        "
@@ -394,7 +403,7 @@ msgstr ""
 "\n"
 "  Miestas:     "
 
-#: addressbook/backend/ebook/e-card.c:3722
+#: addressbook/backend/ebook/e-card.c:3602
 msgid ""
 "\n"
 "  Region:      "
@@ -402,7 +411,7 @@ msgstr ""
 "\n"
 "  Regionas:    "
 
-#: addressbook/backend/ebook/e-card.c:3723
+#: addressbook/backend/ebook/e-card.c:3603
 msgid ""
 "\n"
 "  Postal Code: "
@@ -410,7 +419,7 @@ msgstr ""
 "\n"
 "  Pa�to kodas: "
 
-#: addressbook/backend/ebook/e-card.c:3724
+#: addressbook/backend/ebook/e-card.c:3604
 msgid ""
 "\n"
 "  Country:     "
@@ -418,13 +427,13 @@ msgstr ""
 "\n"
 "  Valstyb�:    "
 
-#: addressbook/backend/ebook/e-card.c:3737
+#: addressbook/backend/ebook/e-card.c:3617
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3749
+#: addressbook/backend/ebook/e-card.c:3629
 msgid ""
 "\n"
 "Telephones:\n"
@@ -432,7 +441,7 @@ msgstr ""
 "\n"
 "Telefonai:\n"
 
-#: addressbook/backend/ebook/e-card.c:3752
+#: addressbook/backend/ebook/e-card.c:3632
 msgid ""
 "\n"
 "Telephone:"
@@ -440,7 +449,7 @@ msgstr ""
 "\n"
 "Telefonas:"
 
-#: addressbook/backend/ebook/e-card.c:3776
+#: addressbook/backend/ebook/e-card.c:3656
 msgid ""
 "\n"
 "E-mail:\n"
@@ -448,7 +457,7 @@ msgstr ""
 "\n"
 "El. pa�tas:\n"
 
-#: addressbook/backend/ebook/e-card.c:3779
+#: addressbook/backend/ebook/e-card.c:3659
 msgid ""
 "\n"
 "E-mail:"
@@ -456,7 +465,7 @@ msgstr ""
 "\n"
 "El. pa�tas:"
 
-#: addressbook/backend/ebook/e-card.c:3798
+#: addressbook/backend/ebook/e-card.c:3678
 msgid ""
 "\n"
 "Mailer: "
@@ -464,7 +473,7 @@ msgstr ""
 "\n"
 "Pa�to programa: "
 
-#: addressbook/backend/ebook/e-card.c:3804
+#: addressbook/backend/ebook/e-card.c:3684
 msgid ""
 "\n"
 "Time Zone: "
@@ -472,7 +481,7 @@ msgstr ""
 "\n"
 "Laiko juosta: "
 
-#: addressbook/backend/ebook/e-card.c:3812
+#: addressbook/backend/ebook/e-card.c:3692
 msgid ""
 "\n"
 "Geo Location: "
@@ -480,7 +489,7 @@ msgstr ""
 "\n"
 "Geogr. vietov�: "
 
-#: addressbook/backend/ebook/e-card.c:3816
+#: addressbook/backend/ebook/e-card.c:3696
 msgid ""
 "\n"
 "Business Role: "
@@ -488,7 +497,7 @@ msgstr ""
 "\n"
 "Darbo pad�tis: "
 
-#: addressbook/backend/ebook/e-card.c:3828
+#: addressbook/backend/ebook/e-card.c:3708
 msgid ""
 "\n"
 "Org: "
@@ -496,7 +505,7 @@ msgstr ""
 "\n"
 "Organizacija: "
 
-#: addressbook/backend/ebook/e-card.c:3829
+#: addressbook/backend/ebook/e-card.c:3709
 msgid ""
 "\n"
 "  Name:  "
@@ -504,31 +513,31 @@ msgstr ""
 "\n"
 "  Vardas: "
 
-#: addressbook/backend/ebook/e-card.c:3830
+#: addressbook/backend/ebook/e-card.c:3710
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3831
+#: addressbook/backend/ebook/e-card.c:3711
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3832
+#: addressbook/backend/ebook/e-card.c:3712
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3833
+#: addressbook/backend/ebook/e-card.c:3713
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3837
+#: addressbook/backend/ebook/e-card.c:3717
 msgid ""
 "\n"
 "Categories: "
@@ -536,7 +545,7 @@ msgstr ""
 "\n"
 "Kategorijos: "
 
-#: addressbook/backend/ebook/e-card.c:3838
+#: addressbook/backend/ebook/e-card.c:3718
 msgid ""
 "\n"
 "Comment: "
@@ -554,7 +563,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3851
+#: addressbook/backend/ebook/e-card.c:3731
 msgid ""
 "\n"
 "Unique String: "
@@ -562,7 +571,7 @@ msgstr ""
 "\n"
 "Unikali eilut�: "
 
-#: addressbook/backend/ebook/e-card.c:3854
+#: addressbook/backend/ebook/e-card.c:3734
 msgid ""
 "\n"
 "Public Key: "
@@ -570,11 +579,11 @@ msgstr ""
 "\n"
 "Vie�as raktas: "
 
-#: addressbook/backend/ebook/e-card.c:4204
+#: addressbook/backend/ebook/e-card.c:4087
 msgid "Multiple VCards"
 msgstr "Keletas VCard korteli�"
 
-#: addressbook/backend/ebook/e-card.c:4212
+#: addressbook/backend/ebook/e-card.c:4095
 #, c-format
 msgid "VCard for %s"
 msgstr "%s VCard"
@@ -583,36 +592,94 @@ msgstr "%s VCard"
 #: 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:1100
+#: addressbook/conduit/address-conduit.c:1167
 #: addressbook/gui/component/addressbook-factory.c:48
-#: calendar/conduits/calendar/calendar-conduit.c:1204
-#: calendar/conduits/todo/todo-conduit.c:1018
-#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:63
+#: calendar/conduits/calendar/calendar-conduit.c:1262
+#: calendar/conduits/todo/todo-conduit.c:1034
+#: calendar/gui/alarm-notify/notify-main.c:78 calendar/gui/main.c:63
 msgid "Could not initialize Bonobo"
 msgstr "Negal�jau inicializuoti Bonobo"
 
-#: addressbook/conduit/address-conduit.c:201
+#: addressbook/backend/pas/pas-backend-file.c:257
+#: addressbook/backend/pas/pas-backend-ldap.c:2047
+#, fuzzy
+msgid "Searching..."
+msgstr "Nuostatos..."
+
+#: addressbook/backend/pas/pas-backend-file.c:259
+#, fuzzy
+msgid "Loading..."
+msgstr "Laukiama..."
+
+#. need a different error message here.
+#: addressbook/backend/pas/pas-backend-file.c:268
+#, fuzzy
+msgid "Error in search expression."
+msgstr ""
+"Klaida vykdant paie�kos i�rai�k� �%s�:\n"
+"%s"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:467
+#, fuzzy
+msgid "Connecting to LDAP server..."
+msgstr "Jungiamasi prie serverio..."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:477
+#, fuzzy
+msgid "Unable to connect to LDAP server."
+msgstr ""
+"Negal�jau autentikuotis � IMAP server�.\n"
+"%s\n"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:493
+#, fuzzy
+msgid "Waiting for connection to LDAP server..."
+msgstr "Jungiamasi prie serverio..."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:862
+#, fuzzy
+msgid "Adding card to LDAP server..."
+msgstr "Jungiamasi prie serverio..."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:959
+#, fuzzy
+msgid "Removing card from LDAP server..."
+msgstr "Pa�alinamos kortel�s..."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:1064
+msgid "Modifying card from LDAP server..."
+msgstr ""
+
+#: addressbook/backend/pas/pas-backend-ldap.c:1992
+msgid "Receiving LDAP search results..."
+msgstr ""
+
+#: addressbook/backend/pas/pas-backend-ldap.c:1997
+msgid "Restarting search."
+msgstr ""
+
+#: addressbook/conduit/address-conduit.c:204
 msgid "Cursor could not be loaded\n"
 msgstr "Nepavyko �kelti �ymeklio\n"
 
-#: addressbook/conduit/address-conduit.c:214
+#: addressbook/conduit/address-conduit.c:217
 msgid "EBook not loaded\n"
 msgstr "EBook ne�kelta\n"
 
-#: addressbook/conduit/address-conduit.c:662
-#: calendar/conduits/calendar/calendar-conduit.c:778
-#: calendar/conduits/todo/todo-conduit.c:592
+#: addressbook/conduit/address-conduit.c:731
+#: calendar/conduits/calendar/calendar-conduit.c:837
+#: calendar/conduits/todo/todo-conduit.c:609
 msgid "Could not start wombat server"
 msgstr "Negal�jau paleisti wombat serverio"
 
-#: addressbook/conduit/address-conduit.c:663
-#: calendar/conduits/calendar/calendar-conduit.c:779
-#: calendar/conduits/todo/todo-conduit.c:593
+#: addressbook/conduit/address-conduit.c:732
+#: calendar/conduits/calendar/calendar-conduit.c:838
+#: calendar/conduits/todo/todo-conduit.c:610
 msgid "Could not start wombat"
 msgstr "Negal�jau paleisti wombat"
 
-#: addressbook/conduit/address-conduit.c:695
-#: addressbook/conduit/address-conduit.c:698
+#: addressbook/conduit/address-conduit.c:762
+#: addressbook/conduit/address-conduit.c:765
 msgid "Could not read pilot's Address application block"
 msgstr "Nepavyko perskaityti piloto Address programos bloko"
 
@@ -659,8 +726,9 @@ msgid "Factory for the sample Addressbook control"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:66
-#: calendar/gui/dialogs/comp-editor-util.c:281
-#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-shortcuts.c:1063
+#: calendar/gui/dialogs/comp-editor-util.c:289
+#: calendar/gui/dialogs/comp-editor-util.c:345 shell/e-local-storage.c:173
+#: shell/e-shortcuts.c:1062
 msgid "Contacts"
 msgstr "Kontaktai"
 
@@ -676,24 +744,24 @@ msgstr "LDAP serveris"
 msgid "LDAP server containing contact information"
 msgstr "LDAP serveris, kuriame laikoma kontakt� informacija"
 
-#: addressbook/gui/component/addressbook-component.c:386
+#: addressbook/gui/component/addressbook-component.c:411
 #: ui/evolution-addressbook.xml.h:11
 msgid "New Contact"
 msgstr "Naujas kontaktas"
 
-#: addressbook/gui/component/addressbook-component.c:386
+#: addressbook/gui/component/addressbook-component.c:411
 msgid "New _Contact"
 msgstr "Naujas _kontaktas"
 
-#: addressbook/gui/component/addressbook-component.c:387
+#: addressbook/gui/component/addressbook-component.c:412
 msgid "New Contact List"
 msgstr "Naujas kontakt� s�ra�as"
 
-#: addressbook/gui/component/addressbook-component.c:387
+#: addressbook/gui/component/addressbook-component.c:412
 msgid "New Contact _List"
 msgstr "Naujas kontakt� _s�ra�as"
 
-#: addressbook/gui/component/addressbook-config.c:144
+#: addressbook/gui/component/addressbook-config.c:188
 msgid "Edit Addressbook"
 msgstr "Redaguoti adres� knygel�"
 
@@ -722,7 +790,7 @@ msgid "Base"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:151
+#: calendar/gui/dialogs/task-editor.c:172
 msgid "Basic"
 msgstr "Pagrindas"
 
@@ -794,19 +862,19 @@ msgid "_Account name:"
 msgstr "_S�skaitos vardas:"
 
 #: addressbook/gui/component/addressbook-config.glade.h:22
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:20
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
+#: mail/mail-config.glade.h:91 my-evolution/my-evolution.glade.h:20
 msgid "_Add"
 msgstr "_Prid�ti"
 
 #: addressbook/gui/component/addressbook-config.glade.h:23
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:95
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:96
 #: ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
 #: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:16
 msgid "_Edit"
 msgstr "K_eisti"
@@ -823,28 +891,32 @@ msgstr "_Prievadas:"
 msgid "_Server name:"
 msgstr "_Serverio vardas:"
 
-#: addressbook/gui/component/addressbook.c:393
+#: addressbook/gui/component/addressbook-storage.c:163
+msgid "Other Contacts"
+msgstr "Kiti kontaktai"
+
+#: addressbook/gui/component/addressbook.c:407
 #, c-format
 msgid "Please enter your email address and password for access to %s"
 msgstr "Pra�om �vesti savo pa�to adres� ir slapta�od�, kad prieitum prie %s"
 
-#: addressbook/gui/component/addressbook.c:401
+#: addressbook/gui/component/addressbook.c:415
 msgid "LDAP Authentication"
 msgstr "LDAP autentikacija"
 
-#: addressbook/gui/component/addressbook.c:412
+#: addressbook/gui/component/addressbook.c:426
 msgid "Email Address:"
 msgstr "El. pa�to adresas:"
 
-#: addressbook/gui/component/addressbook.c:425
+#: addressbook/gui/component/addressbook.c:439
 msgid "Password:"
 msgstr "Slapta�odis:"
 
-#: addressbook/gui/component/addressbook.c:488
+#: addressbook/gui/component/addressbook.c:502
 msgid "Unable to open addressbook"
 msgstr "Negaliu atidaryti adres� knygel�s"
 
-#: addressbook/gui/component/addressbook.c:495
+#: addressbook/gui/component/addressbook.c:509
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -854,7 +926,7 @@ msgstr ""
 "kad arba tu �vedei neteising� URI, arba tavo LDAP serveris\n"
 "neveikia"
 
-#: addressbook/gui/component/addressbook.c:500
+#: addressbook/gui/component/addressbook.c:514
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -866,7 +938,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:508
+#: addressbook/gui/component/addressbook.c:522
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -874,37 +946,37 @@ 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:649
+#: addressbook/gui/component/addressbook.c:663
 #: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "Bet kuris laukas turi savyje"
 
-#: addressbook/gui/component/addressbook.c:650
+#: addressbook/gui/component/addressbook.c:664
 msgid "Name contains"
 msgstr "Vardas turi savyje"
 
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:665
 msgid "Email contains"
 msgstr "El. pa�tas turi savyje"
 
-#: addressbook/gui/component/addressbook.c:652
+#: addressbook/gui/component/addressbook.c:666
 #: calendar/gui/cal-search-bar.c:59
 msgid "Category is"
 msgstr "Kategorija yra"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:653 widgets/misc/e-filter-bar.h:97
+#: addressbook/gui/component/addressbook.c:667 widgets/misc/e-filter-bar.h:97
 #: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "I�sami..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:883
+#: addressbook/gui/component/addressbook.c:897
 #: calendar/gui/cal-search-bar.c:412
 msgid "Any Category"
 msgstr "Bet kuri kategorija"
 
-#: addressbook/gui/component/addressbook.c:925
+#: addressbook/gui/component/addressbook.c:939
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, kur� rodys Aplank� nar�ykl�"
 
@@ -918,8 +990,8 @@ msgid "(none)"
 msgstr "(jokio)"
 
 #: addressbook/gui/component/e-address-popup.c:466
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: addressbook/gui/contact-editor/e-contact-editor.c:1608
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/e-contact-editor.c:1636
 msgid "Primary Email"
 msgstr "Pagrindinis el. pa�tas"
 
@@ -943,13 +1015,13 @@ msgstr "U�klausiama adres� knygel�..."
 
 #: addressbook/gui/component/e-address-popup.c:934
 #: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:314
+#: addressbook/gui/component/select-names/e-select-names-popup.c:307
 msgid "Edit Contact Info"
 msgstr "Keisti kontakto informacij�"
 
 #: addressbook/gui/component/e-address-popup.c:963
 #: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:392
+#: addressbook/gui/component/select-names/e-select-names-popup.c:486
 msgid "Add to Contacts"
 msgstr "Prid�ti prie kontakt�"
 
@@ -973,30 +1045,50 @@ msgstr "Evolution adres� knygel�s vard� pasirinkimo s�saja."
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "Adres� knygel�s vard� pasirinkimo s�sajos gamykla"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:157
-#: addressbook/gui/component/select-names/e-select-names.c:729
-#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
-#: filter/filter-rule.c:543 shell/e-shortcuts-view.c:181
+#: addressbook/gui/component/select-names/e-select-names-popup.c:164
+#: addressbook/gui/component/select-names/e-select-names.c:764
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:436
+#: filter/filter-rule.c:613 shell/e-shortcuts-view.c:181
 msgid "Remove"
 msgstr "Pa�alinti"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:172
+#: addressbook/gui/component/select-names/e-select-names-popup.c:179
 msgid "Remove All"
 msgstr "Pa�alinti visus"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:196
+#: addressbook/gui/component/select-names/e-select-names-popup.c:203
 msgid "Send HTML Mail?"
 msgstr "Si�sti HTML pa�t�?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:415
+#: addressbook/gui/component/select-names/e-select-names-popup.c:406
+#, fuzzy
+msgid "Edit Contact List"
+msgstr "Kontakt� _s�ra�as"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:424
+#, fuzzy
+msgid "Unnamed Contact List"
+msgstr "Bevardis kontaktas"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:441
+#, c-format
+msgid "(%d not shown)"
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:507
 msgid "Unnamed Contact"
 msgstr "Bevardis kontaktas"
 
-#: addressbook/gui/component/select-names/e-select-names.c:487
-msgid "Unable to get local storage.  This should never happen."
+#: addressbook/gui/component/select-names/e-select-names.c:521
+msgid ""
+"Evolution is unable to get the addressbook local storage. This may have been "
+"caused by the evolution-addressbook component crashing. To help us better "
+"understand and ultimately resolve this problem, please send an e-mail to Jon "
+"Trowbridge <trow@ximian.com> with a detailed description of the "
+"circumstances under which this error occurred.  Thank you."
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:560
+#: addressbook/gui/component/select-names/e-select-names.c:598
 msgid "Select Contacts from Addressbook"
 msgstr "Pasirinkti kontaktus i� adres� knygel�s"
 
@@ -1050,121 +1142,142 @@ msgstr "Darbo _faksas"
 msgid "Ca_tegories..."
 msgstr "Ka_tegorijos..."
 
-#. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1213
+msgid "Collaboration"
+msgstr ""
+
+#. Construct the app
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: addressbook/gui/contact-editor/e-contact-editor.c:1241
 msgid "Contact Editor"
 msgstr "Kontakto redaktorius"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor.c:156
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: calendar/gui/dialogs/task-editor.c:177
 msgid "Details"
 msgstr "Detal�s"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#, fuzzy
+msgid "F_ree/Busy URL:"
+msgstr "Laisvas-u�si�m�s URL"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "File A_s:"
 msgstr "Byloje _kaip:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "General"
 msgstr "Esm�"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+msgid ""
+"If this person publishes free/busy or other calendar information on the "
+"Internet, enter the address\n"
+"of that information here."
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "New phone type"
 msgstr "Naujas telefono tipas"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "No_tes:"
 msgstr "Pas_tabos:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Organi_zation:"
 msgstr "Organi_zacija:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "Phone Types"
 msgstr "Telefon� tipai"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "Wants to receive _HTML mail"
 msgstr "Nori gauti _HTML lai�kus"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Address..."
 msgstr "_Adresas..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "_Assistant's name:"
 msgstr "_Asistento vardas:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Birthday:"
 msgstr "_Gimtadienis:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Business"
 msgstr "_Darbo"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 #: calendar/gui/dialogs/event-page.glade.h:12
 #: calendar/gui/dialogs/task-page.glade.h:10
 msgid "_Contacts..."
 msgstr "_Kontaktai..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-#: calendar/gui/dialogs/meeting-page.c:1483 filter/filter.glade.h:8
-#: mail/folder-browser.c:1318 mail/mail-config.glade.h:94
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/meeting-page.c:834 filter/filter.glade.h:8
+#: mail/folder-browser.c:1406 mail/mail-config.glade.h:95
 #: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "_I�trinti"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Department:"
 msgstr "_Departamentas:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Full Name..."
 msgstr "_Pilnas vardas..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Home"
 msgstr "_Nam�"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Job title:"
 msgstr "_Pareigos:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Manager's Name:"
 msgstr "_Vadybininko vardas:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Mobile"
 msgstr "_Mobilus"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Nickname:"
 msgstr "_Slapyvardis:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Office:"
 msgstr "_Ofisas:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Profession:"
 msgstr "_Profesija:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#, fuzzy
+msgid "_Public Calendar URL:"
+msgstr "Spausdinti kalendori�"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Spouse:"
 msgstr "S_utuoktinis:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_This is the mailing address"
 msgstr "_Tai yra pa�to adresas"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Web page address:"
 msgstr "_Tinklapio adresas:"
 
@@ -1180,33 +1293,33 @@ msgstr ""
 msgid "Delete Contact?"
 msgstr "I�trinti kontakt�?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:735
+#: addressbook/gui/contact-editor/e-contact-editor.c:759
 msgid "This contact belongs to these categories:"
 msgstr "�is kontaktas priklauso �ioms kategorijoms:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1584
+#: addressbook/gui/contact-editor/e-contact-editor.c:1612
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2203
+#: addressbook/gui/contact-editor/e-contact-editor.c:2234
 #, fuzzy, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Negal�jau i�trinti aplanko santraukos bylos �%s�: %s"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:284
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
 msgid "Contact Quick-Add"
 msgstr "Kontakto greitas prid�jimas"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:286
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:285
 msgid "Edit Full"
 msgstr "Redaguoti vis�"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:312
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
 #: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "Full Name"
 msgstr "Pilnas vardas"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:318
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
 msgid "E-mail"
 msgstr "El. pa�tas"
 
@@ -2349,7 +2462,7 @@ msgstr "%d korteli�"
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
 #: addressbook/gui/widgets/e-addressbook-view.c:691
 #: addressbook/gui/widgets/e-addressbook-view.c:753
-#: addressbook/gui/widgets/e-addressbook-view.c:1373
+#: addressbook/gui/widgets/e-addressbook-view.c:1422
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "I�saugoti kaip vCard"
@@ -2384,8 +2497,8 @@ msgid "Print Envelope"
 msgstr "Spausdinti vok�"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:274
-#: addressbook/gui/widgets/e-addressbook-view.c:760 filter/libfilter-i18n.h:8
-#: mail/mail-accounts.c:282 ui/evolution-addressbook.xml.h:8
+#: addressbook/gui/widgets/e-addressbook-view.c:760 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:281 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:16
 #: ui/evolution-tasks.xml.h:8
@@ -2403,8 +2516,8 @@ msgid "Success"
 msgstr "S�km�"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1654
-#: shell/e-storage.c:515
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1702
+#: shell/e-storage.c:520
 msgid "Unknown error"
 msgstr "Ne�inoma klaida"
 
@@ -2413,7 +2526,7 @@ msgstr "Ne�inoma klaida"
 msgid "Repository offline"
 msgstr "Dirbti atsijungus"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:505
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:510
 msgid "Permission denied"
 msgstr "Pri�jimas u�draustas"
 
@@ -2430,10 +2543,10 @@ msgid "Protocol not supported"
 msgstr "Protokolas nepalaikomas"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:689 calendar/gui/calendar-model.c:1198
+#: calendar/gui/calendar-model.c:726 calendar/gui/calendar-model.c:1247
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:544
-#: camel/camel-service.c:580
+#: calendar/gui/e-calendar-table.c:461 camel/camel-service.c:598
+#: camel/camel-service.c:634
 msgid "Cancelled"
 msgstr "Nutraukta"
 
@@ -2458,7 +2571,7 @@ msgid "Error removing list"
 msgstr "Klaida pa�alinant s�ra��"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1248
+#: addressbook/gui/widgets/e-addressbook-view.c:1297
 msgid "Error removing card"
 msgstr "Klaida pa�alinant kortel�"
 
@@ -2734,8 +2847,8 @@ msgstr "�_riftas..."
 msgid "Print cards"
 msgstr "Spausdinti korteles"
 
-#: addressbook/printing/e-contact-print.c:1112
-#: addressbook/printing/e-contact-print.c:1134
+#: addressbook/printing/e-contact-print.c:1152
+#: addressbook/printing/e-contact-print.c:1174
 msgid "Print card"
 msgstr "Spausdinti kortel�"
 
@@ -2744,18 +2857,44 @@ msgstr "Spausdinti kortel�"
 msgid "Print envelope"
 msgstr "Spausdinti vok�"
 
-#: calendar/conduits/calendar/calendar-conduit.c:735
-#: calendar/conduits/todo/todo-conduit.c:548
+#: calendar/cal-util/cal-util.c:418 calendar/cal-util/cal-util.c:440
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:385 mail/message-list.c:652
+msgid "High"
+msgstr "Auk�tas"
+
+#: calendar/cal-util/cal-util.c:420 calendar/cal-util/cal-util.c:442
+#: calendar/gui/calendar-model.c:1673
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:386 mail/message-list.c:651
+msgid "Normal"
+msgstr "Normalus"
+
+#: calendar/cal-util/cal-util.c:422 calendar/cal-util/cal-util.c:444
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:387 mail/message-list.c:650
+msgid "Low"
+msgstr "�emas"
+
+#. An empty string is the same as 'None'.
+#: calendar/cal-util/cal-util.c:438
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:388
+msgid "Undefined"
+msgstr "Neapibr��tas"
+
+#: calendar/conduits/calendar/calendar-conduit.c:793
+#: calendar/conduits/todo/todo-conduit.c:564
 msgid "Error while communicating with calendar server"
 msgstr "�vyko klaida, bendraujant su kalendoriaus serveriu"
 
-#: calendar/conduits/calendar/calendar-conduit.c:839
-#: calendar/conduits/calendar/calendar-conduit.c:842
+#: calendar/conduits/calendar/calendar-conduit.c:896
+#: calendar/conduits/calendar/calendar-conduit.c:899
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nepavyko perskaityti piloto Calendar programos bloko"
 
-#: calendar/conduits/todo/todo-conduit.c:653
-#: calendar/conduits/todo/todo-conduit.c:656
+#: calendar/conduits/todo/todo-conduit.c:668
+#: calendar/conduits/todo/todo-conduit.c:671
 msgid "Could not read pilot's ToDo application block"
 msgstr "Negal�jau perskaityti piloto ToDo programos bloko"
 
@@ -2806,45 +2945,45 @@ msgstr "Aliarmo prane�imo tarnyba"
 msgid "Factory for the alarm notification service"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:152
 #, c-format
 msgid "Notification about your appointment starting on %s and ending on %s"
 msgstr "Prane�imas apie tavo �vyk�, prasidedant� %s ir besibaigiant� %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:156
 #, c-format
 msgid "Notification about your appointment starting on %s"
 msgstr "Prane�imas apie tavo �vyk�, prasidedant� %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:161
 #, c-format
 msgid "Notification about your appointment ending on %s"
 msgstr "Prane�imas apie tavo �vyk�, besibaigiant� %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:165
 msgid "Notification about your appointment"
 msgstr "Prane�imas apie tavo �vyk�"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:172
 #, c-format
 msgid "Notification about your task starting on %s and ending on %s"
 msgstr "Prane�imas apie tavo u�duot�, prasidedan�i� %s ir besibaigian�i� %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:176
 #, c-format
 msgid "Notification about your task starting on %s"
 msgstr "Prane�imas apie tavo u�duot�, prasidedan�i� %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:181
 #, c-format
 msgid "Notification about your task ending on %s"
 msgstr "Prane�imas apie tavo u�duot�, besibaigian�i� %s"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:185
 msgid "Notification about your task"
 msgstr "Prane�imas apie tavo u�duot�"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:267
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "Persp�jimas bus %A, %Y %b %d, %H:%M"
 
@@ -2865,179 +3004,150 @@ msgstr "U�tildymo laikas (minut�mis)"
 msgid "_Edit appointment"
 msgstr "K_eisti �vyk�"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:606
+#: calendar/gui/alarm-notify/alarm-queue.c:629
 msgid "No description available."
 msgstr "N�ra jokios apra�ymo."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:825
-#: calendar/gui/alarm-notify/alarm-queue.c:1124
-#: calendar/gui/alarm-notify/alarm-queue.c:1180
-msgid "Reminder of your appointment at "
-msgstr "Priminti man apie �vyk� "
-
-#: calendar/gui/alarm-notify/alarm-queue.c:1116
-msgid "Snooze"
-msgstr "U�tildyti"
-
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:1129
-#: calendar/gui/alarm-notify/alarm-queue.c:1184
-msgid "Ok"
-msgstr "Gerai"
+#: calendar/gui/alarm-notify/alarm-queue.c:689
+msgid ""
+"Evolution does not support calendar reminders with\n"
+"email notifications yet, but this reminder was\n"
+"configured to send an email.  Evolution will display\n"
+"a normal reminder dialog box instead."
+msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:58
+#: calendar/gui/alarm-notify/alarm-queue.c:740
 #, c-format
 msgid ""
-"It is %s.  The Unix time is %ld right now.  We just thought you may like to "
-"know."
+"An Evolution Calendar reminder is about to trigger.\n"
+"This reminder is configured to run the following program:\n"
+"\n"
+"        %s\n"
+"\n"
+"Are you sure you want to run this program?"
 msgstr ""
-"Dabar yra %s. Unix laikas dabar yra %ld. Mes tiesiog pagalvojome, kad tu gali "
-"nor�ti �inoti."
 
-#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:73 calendar/gui/main.c:58
 msgid "Could not initialize GNOME"
 msgstr "Negal�jau inicializuoti GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:106
+#: calendar/gui/alarm-notify/notify-main.c:81 calendar/gui/main.c:106
 msgid "Could not initialize gnome-vfs"
 msgstr "Negal�jau inicializuoti gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:115
+#: calendar/gui/alarm-notify/notify-main.c:90
 #, fuzzy
 msgid "Could not create the alarm notify service factory"
 msgstr "Negal�jau sukurti laikino katalogo: %s"
 
-#: calendar/gui/calendar-commands.c:426
+#: calendar/gui/calendar-commands.c:439
 msgid "%A %d %B %Y"
 msgstr "%A, %Y m. %B %d d."
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:429 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/calendar-commands.c:442 calendar/gui/e-day-view-top-item.c:289
 #: calendar/gui/e-day-view.c:1388 calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr "%a, %b %d"
 
-#: calendar/gui/calendar-commands.c:431 calendar/gui/calendar-commands.c:436
-#: calendar/gui/calendar-commands.c:438
+#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-commands.c:449
+#: calendar/gui/calendar-commands.c:451
 msgid "%a %d %b %Y"
 msgstr "%a, %Y %b %d"
 
-#: calendar/gui/calendar-commands.c:447
-#, c-format
-msgid "%d"
-msgstr "%d"
-
-#: calendar/gui/calendar-commands.c:449 calendar/gui/calendar-commands.c:456
-#: calendar/gui/calendar-commands.c:462 calendar/gui/calendar-commands.c:464
+#: calendar/gui/calendar-commands.c:462 calendar/gui/calendar-commands.c:469
+#: calendar/gui/calendar-commands.c:475 calendar/gui/calendar-commands.c:477
 msgid "%d %B %Y"
 msgstr "%Y m. %B %d d."
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:454
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: calendar/gui/calendar-commands.c:467
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1446
 msgid "%d %B"
 msgstr "%B %d"
 
-#: calendar/gui/calendar-commands.c:664
+#: calendar/gui/calendar-commands.c:677
 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:355 calendar/gui/calendar-model.c:925
-#: calendar/gui/e-calendar-table.c:307
+#: calendar/gui/calendar-model.c:399 calendar/gui/calendar-model.c:994
+#: calendar/gui/e-calendar-table.c:364
 msgid "Private"
 msgstr "Asmeni�kas"
 
-#: calendar/gui/calendar-model.c:358 calendar/gui/calendar-model.c:927
-#: calendar/gui/e-calendar-table.c:308
+#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:996
+#: calendar/gui/e-calendar-table.c:365
 msgid "Confidential"
 msgstr "Slaptas"
 
-#: calendar/gui/calendar-model.c:361 calendar/gui/e-calendar-table.c:306
+#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:363
 msgid "Public"
 msgstr "Vie�as"
 
-#: calendar/gui/calendar-model.c:454
+#: calendar/gui/calendar-model.c:498
 msgid "N"
 msgstr "�"
 
-#: calendar/gui/calendar-model.c:454
+#: calendar/gui/calendar-model.c:498
 msgid "S"
 msgstr "P"
 
-#: calendar/gui/calendar-model.c:456
+#: calendar/gui/calendar-model.c:500
 msgid "E"
 msgstr "R"
 
-#: calendar/gui/calendar-model.c:456
+#: calendar/gui/calendar-model.c:500
 msgid "W"
 msgstr "V"
 
-#: calendar/gui/calendar-model.c:494 calendar/gui/calendar-model.c:1107
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:652
-msgid "High"
-msgstr "Auk�tas"
-
-#: calendar/gui/calendar-model.c:496 calendar/gui/calendar-model.c:1109
-#: calendar/gui/calendar-model.c:1624
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:651
-msgid "Normal"
-msgstr "Normalus"
-
-#: calendar/gui/calendar-model.c:498 calendar/gui/calendar-model.c:1111
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:650
-msgid "Low"
-msgstr "�emas"
-
-#: calendar/gui/calendar-model.c:529 calendar/gui/calendar-model.c:1144
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/calendar-model.c:566 calendar/gui/calendar-model.c:1193
+#: calendar/gui/e-calendar-table.c:437
 msgid "Free"
 msgstr "Laisvas"
 
-#: calendar/gui/calendar-model.c:531 calendar/gui/e-calendar-table.c:381
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+#: calendar/gui/calendar-model.c:568 calendar/gui/e-calendar-table.c:438
+#: calendar/gui/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr "U�imtas"
 
-#: calendar/gui/calendar-model.c:680 calendar/gui/calendar-model.c:1192
+#: calendar/gui/calendar-model.c:717 calendar/gui/calendar-model.c:1241
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:401
+#: calendar/gui/e-calendar-table.c:458
 msgid "Not Started"
 msgstr "Neprad�ta"
 
-#: calendar/gui/calendar-model.c:683 calendar/gui/calendar-model.c:1194
+#: calendar/gui/calendar-model.c:720 calendar/gui/calendar-model.c:1243
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:402
+#: calendar/gui/e-calendar-table.c:459
 msgid "In Progress"
 msgstr "Vykdoma"
 
-#: calendar/gui/calendar-model.c:686 calendar/gui/calendar-model.c:1196
-#: calendar/gui/dialogs/meeting-page.c:665
-#: calendar/gui/dialogs/meeting-page.c:688
+#: calendar/gui/calendar-model.c:723 calendar/gui/calendar-model.c:1245
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-calendar-table.c:460 calendar/gui/e-meeting-model.c:298
+#: calendar/gui/e-meeting-model.c:321
 msgid "Completed"
 msgstr "U�baigta"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:323
+#: calendar/gui/calendar-model.c:908 e-util/e-time-utils.c:163
+#: e-util/e-time-utils.c:354
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %Y-%m-%d %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:842 e-util/e-time-utils.c:332
+#: calendar/gui/calendar-model.c:911 e-util/e-time-utils.c:158
+#: e-util/e-time-utils.c:363
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %Y-%m-%d %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:847
+#: calendar/gui/calendar-model.c:916
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -3048,7 +3158,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:1011
+#: calendar/gui/calendar-model.c:1080
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3058,50 +3168,37 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1051
+#: calendar/gui/calendar-model.c:1120
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Procentin� reik�m� turi b�ti tarp 0 ir 100 imtinai"
 
-#: calendar/gui/calendar-model.c:1092
-msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
-msgstr ""
-"Prioritetas turi b�ti �Auk�tas�, �Normalus�, ��emas� arba �Neapibr��tas�."
-
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1105
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:331
-msgid "Undefined"
-msgstr "Neapibr��tas"
-
-#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1190 calendar/gui/dialogs/meeting-page.c:360
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1430
-#: mail/mail-accounts.c:144 mail/mail-accounts.c:391
-#: mail/mail-config.glade.h:49
+#: calendar/gui/calendar-model.c:1239 calendar/gui/dialogs/meeting-page.c:332
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1446
+#: mail/mail-accounts.c:143 mail/mail-accounts.c:390
+#: mail/mail-config.glade.h:50
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:203
-#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
-#: widgets/misc/e-dateedit.c:1407 widgets/misc/e-dateedit.c:1522
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:453
+#: widgets/misc/e-dateedit.c:1453 widgets/misc/e-dateedit.c:1568
 msgid "None"
 msgstr "Joks"
 
-#: calendar/gui/calendar-model.c:1626
+#: calendar/gui/calendar-model.c:1675
 msgid "Recurring"
 msgstr "Pasikartojantis"
 
-#: calendar/gui/calendar-model.c:1628
+#: calendar/gui/calendar-model.c:1677
 msgid "Assigned"
 msgstr "Priskirtas"
 
-#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:637
-#: calendar/gui/dialogs/meeting-page.c:647
-#: calendar/gui/dialogs/meeting-page.c:1179
-#: calendar/gui/dialogs/meeting-page.c:1286
+#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:270
+#: calendar/gui/e-meeting-model.c:280 calendar/gui/e-meeting-model.c:506
+#: calendar/gui/e-meeting-model.c:702
 msgid "Yes"
 msgstr "Taip"
 
-#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:649
-#: calendar/gui/dialogs/meeting-page.c:1287
+#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:282
+#: calendar/gui/e-meeting-model.c:703
 msgid "No"
 msgstr "Ne"
 
@@ -3133,43 +3230,44 @@ msgstr "Apra�ymas turi savyje"
 msgid "Comment contains"
 msgstr "Komentaras turi savyje"
 
-#: calendar/gui/cal-search-bar.c:416
+#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1054
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/component-factory.c:61 my-evolution/my-evolution.glade.h:6
-#: shell/e-shortcuts.c:1057
+#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:6
+#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1056
 msgid "Calendar"
 msgstr "Kalendorius"
 
-#: calendar/gui/component-factory.c:62
+#: calendar/gui/component-factory.c:64
 msgid "Folder containing appointments and events"
 msgstr "Aplankas, kuriame saugomi �vykiai ir susitikimai"
 
-#: calendar/gui/component-factory.c:66 calendar/gui/print.c:1707
-#: my-evolution/e-summary-tasks.c:212 my-evolution/e-summary-tasks.c:228
-#: shell/e-shortcuts.c:1060 views/tasks/galview.xml.h:1
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1723
+#: my-evolution/e-summary-tasks.c:237 my-evolution/e-summary-tasks.c:253
+#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1059
+#: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "U�duotys"
 
-#: calendar/gui/component-factory.c:67
+#: calendar/gui/component-factory.c:69
 msgid "Folder containing to-do items"
 msgstr "Aplankas, kuriame yra u�duotys"
 
-#: calendar/gui/component-factory.c:512 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:581 ui/evolution-calendar.xml.h:7
 msgid "Create a new appointment"
 msgstr "Sukurti nauj� �vyk�"
 
-#: calendar/gui/component-factory.c:513 calendar/gui/e-day-view.c:3420
+#: calendar/gui/component-factory.c:582 calendar/gui/e-day-view.c:3422
 msgid "New _Appointment"
 msgstr "Naujas �_vykis"
 
-#: calendar/gui/component-factory.c:518 ui/evolution-calendar.xml.h:8
+#: calendar/gui/component-factory.c:587 ui/evolution-calendar.xml.h:8
 #: ui/evolution-tasks.xml.h:5
 msgid "Create a new task"
 msgstr "Sukurti nauj� u�duot�"
 
-#: calendar/gui/component-factory.c:519
+#: calendar/gui/component-factory.c:588
 msgid "New _Task"
 msgstr "Nauja _u�duotis"
 
@@ -3177,23 +3275,23 @@ msgstr "Nauja _u�duotis"
 msgid "The URI that the calendar will display"
 msgstr "URI, kur� rodys kalendorius"
 
-#: calendar/gui/dialogs/alarm-options.c:357
+#: calendar/gui/dialogs/alarm-options.c:359
 msgid "Audio Alarm Options"
 msgstr "Persp�jim� garsu parinktys"
 
-#: calendar/gui/dialogs/alarm-options.c:366
+#: calendar/gui/dialogs/alarm-options.c:368
 msgid "Message Alarm Options"
 msgstr "Persp�jim� prane�imu parinktys"
 
-#: calendar/gui/dialogs/alarm-options.c:375
+#: calendar/gui/dialogs/alarm-options.c:377
 msgid "Mail Alarm Options"
 msgstr "Persp�jim� pa�tu parinktys"
 
-#: calendar/gui/dialogs/alarm-options.c:384
+#: calendar/gui/dialogs/alarm-options.c:386
 msgid "Program Alarm Options"
 msgstr "Persp�jim� programa parinktys"
 
-#: calendar/gui/dialogs/alarm-options.c:393
+#: calendar/gui/dialogs/alarm-options.c:395
 msgid "Unknown Alarm Options"
 msgstr "Ne�inom� persp�jim� parinktys"
 
@@ -3202,25 +3300,27 @@ msgid "Alarm Repeat"
 msgstr "Persp�jim� kartojimas"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid "FIXME: mail alarm options"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.glade.h:3
 msgid "Message to Display"
 msgstr "Rodomas prane�imas"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:4
+#: calendar/gui/dialogs/alarm-options.glade.h:3
 msgid "Play sound:"
 msgstr "Groti gars�:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:4
 msgid "Repeat the alarm"
 msgstr "Kartoti persp�jim�"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:6
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Run program:"
 msgstr "Paleisti program�:"
 
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+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 ""
+
 #: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "With these arguments:"
 msgstr "Su tokiais argumentais:"
@@ -3241,98 +3341,119 @@ msgstr "valand�"
 msgid "minutes"
 msgstr "minu�i�"
 
-#: calendar/gui/dialogs/alarm-page.c:304
+#: calendar/gui/dialogs/alarm-page.c:307
 #, c-format
 msgid "%d days"
 msgstr "%d dien�"
 
-#: calendar/gui/dialogs/alarm-page.c:306
+#: calendar/gui/dialogs/alarm-page.c:310
 msgid "1 day"
 msgstr "1 diena"
 
-#: calendar/gui/dialogs/alarm-page.c:309
+#: calendar/gui/dialogs/alarm-page.c:315
 #, c-format
 msgid "%d weeks"
 msgstr "%d savai�i�"
 
-#: calendar/gui/dialogs/alarm-page.c:311
+#: calendar/gui/dialogs/alarm-page.c:318
 msgid "1 week"
 msgstr "1 savait�"
 
-#: calendar/gui/dialogs/alarm-page.c:314
+#: calendar/gui/dialogs/alarm-page.c:323
 #, c-format
 msgid "%d hours"
 msgstr "%d valand�"
 
-#: calendar/gui/dialogs/alarm-page.c:316
+#: calendar/gui/dialogs/alarm-page.c:326
 msgid "1 hour"
 msgstr "1 valanda"
 
-#: calendar/gui/dialogs/alarm-page.c:319
+#: calendar/gui/dialogs/alarm-page.c:331
 #, c-format
 msgid "%d minutes"
 msgstr "%d minu�i�"
 
-#: calendar/gui/dialogs/alarm-page.c:321
+#: calendar/gui/dialogs/alarm-page.c:334
 msgid "1 minute"
 msgstr "1 minut�"
 
-#: calendar/gui/dialogs/alarm-page.c:324
+#: calendar/gui/dialogs/alarm-page.c:339
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekund�i�"
 
-#: calendar/gui/dialogs/alarm-page.c:326
+#: calendar/gui/dialogs/alarm-page.c:342
 msgid "1 second"
 msgstr "1 sekund�"
 
-#: calendar/gui/dialogs/alarm-page.c:351
+#: calendar/gui/dialogs/alarm-page.c:373
 #: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "Groti gars�"
 
-#: calendar/gui/dialogs/alarm-page.c:355
+#: calendar/gui/dialogs/alarm-page.c:377
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 msgid "Display a message"
 msgstr "Rodyti prane�im�"
 
-#: calendar/gui/dialogs/alarm-page.c:359
-#: calendar/gui/dialogs/alarm-page.glade.h:7
+#: calendar/gui/dialogs/alarm-page.c:381
 msgid "Send an email"
 msgstr "Pasi�sti lai�k�"
 
-#: calendar/gui/dialogs/alarm-page.c:363
+#: calendar/gui/dialogs/alarm-page.c:385
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "Paleisti program�"
 
-#: calendar/gui/dialogs/alarm-page.c:369 calendar/gui/dialogs/alarm-page.c:405
-#: calendar/gui/dialogs/meeting-page.c:593
-#: calendar/gui/dialogs/meeting-page.c:628
-#: calendar/gui/dialogs/meeting-page.c:693
-#: calendar/gui/dialogs/meeting-page.c:1258
-#: calendar/gui/dialogs/meeting-page.c:1274
-#: camel/providers/smtp/camel-smtp-transport.c:224
-#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
-msgid "Unknown"
-msgstr "Ne�inomas"
+#: calendar/gui/dialogs/alarm-page.c:391
+msgid "Unknown action to be performed"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:381
-msgid "before start of appointment"
+#: calendar/gui/dialogs/alarm-page.c:403
+#, fuzzy, c-format
+msgid "%s %s before the start of the appointment"
 msgstr "prie� �vykio prad�i�"
 
-#: calendar/gui/dialogs/alarm-page.c:384
-msgid "after start of appointment"
-msgstr "po �vykio prad�ios"
+#: calendar/gui/dialogs/alarm-page.c:406
+#, fuzzy, c-format
+msgid "%s %s after the start of the appointment"
+msgstr "prie� �vykio prad�i�"
 
-#: calendar/gui/dialogs/alarm-page.c:394
-msgid "before end of appointment"
-msgstr "prie� �vykio pabaig�"
+#: calendar/gui/dialogs/alarm-page.c:411
+#, fuzzy, c-format
+msgid "%s at the start of the appointment"
+msgstr "prie� �vykio prad�i�"
 
-#: calendar/gui/dialogs/alarm-page.c:397
-msgid "after end of appointment"
+#: calendar/gui/dialogs/alarm-page.c:420
+#, fuzzy, c-format
+msgid "%s %s before the end of the appointment"
+msgstr "prie� �vykio prad�i�"
+
+#: calendar/gui/dialogs/alarm-page.c:423
+#, fuzzy, c-format
+msgid "%s %s after the end of the appointment"
 msgstr "po �vykio pabaigos"
 
+#: calendar/gui/dialogs/alarm-page.c:428
+#, fuzzy, c-format
+msgid "%s at the end of the appointment"
+msgstr "po �vykio pabaigos"
+
+#: calendar/gui/dialogs/alarm-page.c:439
+#, fuzzy, c-format
+msgid "%s at an unknown time"
+msgstr "Ne�inoma klaida"
+
+#: calendar/gui/dialogs/alarm-page.c:445
+#, fuzzy, c-format
+msgid "%s at %s"
+msgstr "%s serveris %s"
+
+#: calendar/gui/dialogs/alarm-page.c:452
+#, c-format
+msgid "%s for an unknown trigger type"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3347,42 +3468,43 @@ msgstr "Data/Laikas:"
 msgid "Reminders"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Ap�valga:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-page.glade.h:10
 msgid "_Options..."
 msgstr "_Parinktys..."
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:34
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:11 filter/libfilter-i18n.h:2
 msgid "after"
 msgstr "po"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:35
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:6
 msgid "before"
 msgstr "prie�"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-page.glade.h:13
 #: calendar/gui/dialogs/recurrence-page.glade.h:14
 msgid "day(s)"
 msgstr "dien�(as)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-page.glade.h:14
 msgid "end of appointment"
 msgstr "�vykio pabaig�"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/alarm-page.glade.h:15
 msgid "hour(s)"
 msgstr "valand�(as)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:116
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:116
 msgid "minute(s)"
 msgstr "minut�(es)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:18
+#: calendar/gui/dialogs/alarm-page.glade.h:17
 msgid "start of appointment"
 msgstr "�vykio prad�i�"
 
@@ -3431,7 +3553,7 @@ msgid "First day of wee_k:"
 msgstr "Pirma sa_vait�s diena:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:950
+#: calendar/gui/dialogs/recurrence-page.c:955
 msgid "Friday"
 msgstr "Penktadienis"
 
@@ -3444,7 +3566,7 @@ msgid "Minutes"
 msgstr "Minu�i�"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:946
+#: calendar/gui/dialogs/recurrence-page.c:951
 msgid "Monday"
 msgstr "Pirmadienis"
 
@@ -3453,7 +3575,7 @@ msgid "O_verdue tasks:"
 msgstr "_V�luojamos u�duotys:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:951
+#: calendar/gui/dialogs/recurrence-page.c:956
 msgid "Saturday"
 msgstr "�e�tadienis"
 
@@ -3474,7 +3596,7 @@ msgid "Su_n"
 msgstr "_Sek"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:952
+#: calendar/gui/dialogs/recurrence-page.c:957
 msgid "Sunday"
 msgstr "Sekmadienis"
 
@@ -3491,7 +3613,7 @@ msgid "Tas_ks due today:"
 msgstr "�ia_ndienos u�duotys:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/recurrence-page.c:949
+#: calendar/gui/dialogs/recurrence-page.c:954
 msgid "Thursday"
 msgstr "Ketvirtadienis"
 
@@ -3512,12 +3634,12 @@ msgid "Time format:"
 msgstr "Laiko formatas:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:947
+#: calendar/gui/dialogs/recurrence-page.c:952
 msgid "Tuesday"
 msgstr "Antradienis"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:948
+#: calendar/gui/dialogs/recurrence-page.c:953
 msgid "Wednesday"
 msgstr "Tre�iadienis"
 
@@ -3648,55 +3770,55 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Tu nieko nepakeitei, atnaujinti redaktori�?"
 
-#: calendar/gui/dialogs/comp-editor-util.c:159 calendar/gui/print.c:2116
+#: calendar/gui/dialogs/comp-editor-util.c:167 calendar/gui/print.c:2132
 msgid " to "
 msgstr " iki "
 
-#: calendar/gui/dialogs/comp-editor-util.c:163 calendar/gui/print.c:2120
+#: calendar/gui/dialogs/comp-editor-util.c:171 calendar/gui/print.c:2136
 msgid " (Completed "
 msgstr " (U�baigta "
 
-#: calendar/gui/dialogs/comp-editor-util.c:165 calendar/gui/print.c:2122
+#: calendar/gui/dialogs/comp-editor-util.c:173 calendar/gui/print.c:2138
 msgid "Completed "
 msgstr "U�baigta "
 
-#: calendar/gui/dialogs/comp-editor-util.c:170 calendar/gui/print.c:2127
+#: calendar/gui/dialogs/comp-editor-util.c:178 calendar/gui/print.c:2143
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2129
+#: calendar/gui/dialogs/comp-editor-util.c:180 calendar/gui/print.c:2145
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:469
+#: calendar/gui/dialogs/comp-editor.c:521
 msgid "Edit Appointment"
 msgstr "Keisti �vyk�"
 
-#: calendar/gui/dialogs/comp-editor.c:474
+#: calendar/gui/dialogs/comp-editor.c:526
 #, c-format
 msgid "Appointment - %s"
 msgstr "�vykis -- %s"
 
-#: calendar/gui/dialogs/comp-editor.c:477
+#: calendar/gui/dialogs/comp-editor.c:529
 #, c-format
 msgid "Task - %s"
 msgstr "U�duotis -- %s"
 
-#: calendar/gui/dialogs/comp-editor.c:480
+#: calendar/gui/dialogs/comp-editor.c:532
 #, c-format
 msgid "Journal entry - %s"
 msgstr "�urnalo �ra�as -- %s"
 
-#: calendar/gui/dialogs/comp-editor.c:494
+#: calendar/gui/dialogs/comp-editor.c:546
 msgid "No summary"
 msgstr "N�ra ap�valgos"
 
-#: calendar/gui/dialogs/comp-editor.c:860 mail/mail-callbacks.c:1524
+#: calendar/gui/dialogs/comp-editor.c:952 mail/mail-callbacks.c:1671
 #: mail/mail-display.c:100
 msgid "Overwrite file?"
 msgstr "U�ra�yti byl�?"
 
-#: calendar/gui/dialogs/comp-editor.c:864 mail/mail-callbacks.c:1530
+#: calendar/gui/dialogs/comp-editor.c:956 mail/mail-callbacks.c:1677
 #: mail/mail-display.c:104
 msgid ""
 "A file by that name already exists.\n"
@@ -3705,53 +3827,53 @@ msgstr ""
 "Byla tokiu vardu jau yra.\n"
 "U�ra�yti j�?"
 
-#: calendar/gui/dialogs/comp-editor.c:927 ui/evolution-comp-editor.xml.h:13
+#: calendar/gui/dialogs/comp-editor.c:1019 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 msgid "Save As..."
 msgstr "I�saugoti kaip..."
 
-#: calendar/gui/dialogs/comp-editor.c:1080
+#: calendar/gui/dialogs/comp-editor.c:1172
 msgid "Unable to obtain current version!"
 msgstr "nepavyko gauti esamos versijos!"
 
-#: calendar/gui/dialogs/delete-comp.c:84
+#: calendar/gui/dialogs/delete-comp.c:91
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Ar tu tikrai nori i�trinti �vyk� �%s�?"
 
-#: calendar/gui/dialogs/delete-comp.c:87
+#: calendar/gui/dialogs/delete-comp.c:94
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Ar tu tikrai nori i�trinti �� bevard� �vyk�?"
 
-#: calendar/gui/dialogs/delete-comp.c:93
+#: calendar/gui/dialogs/delete-comp.c:100
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Ar tu tikrai nori i�trinti u�duot� �%s�?"
 
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/delete-comp.c:103
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Ar tu tikrai nori i�trinti �i� bevard� u�duot�?"
 
-#: calendar/gui/dialogs/delete-comp.c:102
+#: calendar/gui/dialogs/delete-comp.c:109
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Ar tu tikrai nori i�trinti �urnalo �ra�� �%s�?"
 
-#: calendar/gui/dialogs/delete-comp.c:105
+#: calendar/gui/dialogs/delete-comp.c:112
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Ar tu tikrai nori i�trinti �� bevard� �urnalo �ra��?"
 
-#: calendar/gui/dialogs/delete-comp.c:120
+#: calendar/gui/dialogs/delete-comp.c:127
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Ar tu tikrai nori i�trinti %d �vyki�?"
 
-#: calendar/gui/dialogs/delete-comp.c:125
+#: calendar/gui/dialogs/delete-comp.c:132
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Ar tu tikrai nori i�trinti %d u�duo�i�?"
 
-#: calendar/gui/dialogs/delete-comp.c:130
+#: calendar/gui/dialogs/delete-comp.c:137
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Ar tu tikrai nori i�trinti %d �urnalo �ra��?"
@@ -3768,20 +3890,26 @@ msgstr "Pavesti kam:"
 msgid "Enter Delegate"
 msgstr "�vesti, kam pavedama"
 
-#: calendar/gui/dialogs/event-editor.c:156
+#: calendar/gui/dialogs/event-editor.c:181
 msgid "Appointment"
 msgstr "�vykis"
 
-#: calendar/gui/dialogs/event-editor.c:161
+#: calendar/gui/dialogs/event-editor.c:186
 msgid "Reminder"
 msgstr "Priminimas"
 
-#: calendar/gui/dialogs/event-editor.c:166
+#: calendar/gui/dialogs/event-editor.c:191
 msgid "Recurrence"
 msgstr "Pasikartojimas"
 
-#: calendar/gui/dialogs/event-editor.c:171
-#: calendar/gui/dialogs/event-editor.c:273
+#: calendar/gui/dialogs/event-editor.c:198
+#: calendar/gui/dialogs/event-editor.c:345
+#, fuzzy
+msgid "Scheduling"
+msgstr "�traukti s_usitikim� � dienotvark�"
+
+#: calendar/gui/dialogs/event-editor.c:203
+#: calendar/gui/dialogs/event-editor.c:348
 msgid "Meeting"
 msgstr "Susitikimas"
 
@@ -3840,170 +3968,94 @@ msgstr "P_abaigos laikas:"
 msgid "_Start time:"
 msgstr "_Prad�ios laikas:"
 
-#: calendar/gui/dialogs/meeting-page.c:568
-#: calendar/gui/dialogs/meeting-page.c:585
-#: calendar/gui/dialogs/meeting-page.c:1175
-#: calendar/gui/dialogs/meeting-page.c:1254
-msgid "Individual"
-msgstr "Individas"
-
-#: calendar/gui/dialogs/meeting-page.c:570
-#: calendar/gui/dialogs/meeting-page.c:587
-#: calendar/gui/dialogs/meeting-page.c:1255
-msgid "Group"
-msgstr "Grup�"
-
-#: calendar/gui/dialogs/meeting-page.c:572
-#: calendar/gui/dialogs/meeting-page.c:589
-#: calendar/gui/dialogs/meeting-page.c:1256
-msgid "Resource"
-msgstr "Resursas"
-
-#: calendar/gui/dialogs/meeting-page.c:574
-#: calendar/gui/dialogs/meeting-page.c:591
-#: calendar/gui/dialogs/meeting-page.c:1257
-msgid "Room"
-msgstr "Kambarys"
-
-#: calendar/gui/dialogs/meeting-page.c:603
-#: calendar/gui/dialogs/meeting-page.c:620
-#: calendar/gui/dialogs/meeting-page.c:1270
-msgid "Chair"
-msgstr "Pirmininkas"
-
-#: calendar/gui/dialogs/meeting-page.c:605
-#: calendar/gui/dialogs/meeting-page.c:622
-#: calendar/gui/dialogs/meeting-page.c:1177
-#: calendar/gui/dialogs/meeting-page.c:1271
-msgid "Required Participant"
-msgstr "B�tinas dalyvis"
-
-#: calendar/gui/dialogs/meeting-page.c:607
-#: calendar/gui/dialogs/meeting-page.c:624
-#: calendar/gui/dialogs/meeting-page.c:1272
-msgid "Optional Participant"
-msgstr "Neb�tinas dalyvis"
-
-#: calendar/gui/dialogs/meeting-page.c:609
-#: calendar/gui/dialogs/meeting-page.c:626
-#: calendar/gui/dialogs/meeting-page.c:1273
-msgid "Non-Participant"
-msgstr "Ne dalyvis"
-
-#: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/dialogs/meeting-page.c:678
-#: calendar/gui/dialogs/meeting-page.c:1185
-#: calendar/gui/dialogs/meeting-page.c:1299
-msgid "Needs Action"
-msgstr "Reikalauja veiksmo"
-
-#: calendar/gui/dialogs/meeting-page.c:657
-#: calendar/gui/dialogs/meeting-page.c:680
-#: calendar/gui/dialogs/meeting-page.c:1300
-msgid "Accepted"
-msgstr "Priimtas"
-
-#: calendar/gui/dialogs/meeting-page.c:659
-#: calendar/gui/dialogs/meeting-page.c:682
-#: calendar/gui/dialogs/meeting-page.c:1301
-msgid "Declined"
-msgstr "Atmestas"
-
-#: calendar/gui/dialogs/meeting-page.c:661
-#: calendar/gui/dialogs/meeting-page.c:684
-#: calendar/gui/dialogs/meeting-page.c:1302
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
-msgid "Tentative"
-msgstr "Negalutinis"
-
-#: calendar/gui/dialogs/meeting-page.c:663
-#: calendar/gui/dialogs/meeting-page.c:686
-#: calendar/gui/dialogs/meeting-page.c:1303
-msgid "Delegated"
-msgstr "Pavestas"
-
-#: calendar/gui/dialogs/meeting-page.c:667
-#: calendar/gui/dialogs/meeting-page.c:690
-msgid "In Process"
-msgstr "Vykdomas"
-
-#: calendar/gui/dialogs/meeting-page.c:729
+#: calendar/gui/dialogs/meeting-page.c:504
 msgid "That person is already attending the meeting!"
 msgstr "Tas asmuo jau dalyvauja susitikime!"
 
-#: calendar/gui/dialogs/meeting-page.c:780
-#: calendar/gui/dialogs/meeting-page.c:834
+#: calendar/gui/dialogs/meeting-page.c:548
+#: calendar/gui/dialogs/meeting-page.c:583
 msgid "Chair Persons"
 msgstr "Pirmininkaujantys asmenys"
 
-#: calendar/gui/dialogs/meeting-page.c:782
-#: calendar/gui/dialogs/meeting-page.c:834
-#: calendar/gui/dialogs/meeting-page.c:954
+#: calendar/gui/dialogs/meeting-page.c:550
+#: calendar/gui/dialogs/meeting-page.c:583
+#: calendar/gui/dialogs/meeting-page.c:703
 msgid "Required Participants"
 msgstr "B�tini dalyviai"
 
-#: calendar/gui/dialogs/meeting-page.c:784
-#: calendar/gui/dialogs/meeting-page.c:834
+#: calendar/gui/dialogs/meeting-page.c:552
+#: calendar/gui/dialogs/meeting-page.c:583
 msgid "Optional Participants"
 msgstr "Neb�tini dalyviai"
 
-#: calendar/gui/dialogs/meeting-page.c:786
-#: calendar/gui/dialogs/meeting-page.c:834
+#: calendar/gui/dialogs/meeting-page.c:554
+#: calendar/gui/dialogs/meeting-page.c:583
 msgid "Non-Participants"
 msgstr "Ne dalyviai"
 
-#: calendar/gui/dialogs/meeting-page.c:912
+#: calendar/gui/dialogs/meeting-page.c:661
 msgid "Sent By:"
 msgstr "I�siunt�:"
 
-#: calendar/gui/dialogs/meeting-page.c:1478
+#: calendar/gui/dialogs/meeting-page.c:829
 msgid "_Delegate To..."
 msgstr "_Pavesti kam..."
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
+#: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Dalyvis"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
+#: calendar/gui/e-meeting-time-sel.etspec.h:2
 msgid "Click here to add an attendee"
 msgstr "Spausk �ia, kad prid�tum dalyv�"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Common Name"
 msgstr "Bendras vardas"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
 msgid "Delegated From"
 msgstr "Pavesta kieno"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Delegated To"
 msgstr "Pavesta kam"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "Language"
 msgstr "Kalba"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "Member"
 msgstr "Narys"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Rol�"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:15 filter/libfilter-i18n.h:31
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:49
 #: mail/message-list.etspec.h:8
 msgid "Status"
 msgstr "B�sena"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:18 mail/mail-config.glade.h:85
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:86
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Tipas"
@@ -4025,32 +4077,32 @@ msgstr "Pakv_iesti kitus"
 msgid "_Other Organizer"
 msgstr "_Kitas organizatorius"
 
-#: calendar/gui/dialogs/recurrence-page.c:417 calendar/gui/print.c:1839
-#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+#: calendar/gui/dialogs/recurrence-page.c:422 calendar/gui/print.c:1855
+#: calendar/gui/print.c:1857 calendar/gui/print.c:1858
 msgid "%a %b %d %Y"
 msgstr "%a, %Y %b %d"
 
-#: calendar/gui/dialogs/recurrence-page.c:565
+#: calendar/gui/dialogs/recurrence-page.c:570
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "�iame �vykyje yra pasikartojim�, kuri� Evolution negali keisti."
 
-#: calendar/gui/dialogs/recurrence-page.c:919
+#: calendar/gui/dialogs/recurrence-page.c:924
 msgid "on"
 msgstr "lygiai"
 
-#: calendar/gui/dialogs/recurrence-page.c:945 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:950 filter/filter-datespec.c:83
 msgid "day"
 msgstr "diena"
 
-#: calendar/gui/dialogs/recurrence-page.c:1075
+#: calendar/gui/dialogs/recurrence-page.c:1080
 msgid "on the"
 msgstr " "
 
-#: calendar/gui/dialogs/recurrence-page.c:1083
+#: calendar/gui/dialogs/recurrence-page.c:1088
 msgid "th"
 msgstr "-�"
 
-#: calendar/gui/dialogs/recurrence-page.c:1256
+#: calendar/gui/dialogs/recurrence-page.c:1261
 msgid "occurrences"
 msgstr "kart�(us) pasitaikys"
 
@@ -4145,7 +4197,7 @@ msgid "Progress"
 msgstr "Pa�anga"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:896
+#: my-evolution/e-summary-preferences.c:949
 msgid "URL:"
 msgstr "URL:"
 
@@ -4157,14 +4209,14 @@ msgstr "_Svarbumas:"
 msgid "_Status:"
 msgstr "_B�sena:"
 
-#: calendar/gui/dialogs/task-editor.c:161
-#: calendar/gui/dialogs/task-editor.c:239
+#: calendar/gui/dialogs/task-editor.c:184
+#: calendar/gui/dialogs/task-editor.c:285
 msgid "Assignment"
 msgstr "Priskyrimas"
 
 #: calendar/gui/dialogs/task-page.glade.h:4
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:28
 msgid "Description:"
 msgstr "Apra�ymas:"
 
@@ -4180,105 +4232,105 @@ msgstr "_Slaptas"
 msgid "_Due Date:"
 msgstr "_Kada reikia:"
 
-#: calendar/gui/e-calendar-table.c:350
+#: calendar/gui/e-calendar-table.c:407
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:351
+#: calendar/gui/e-calendar-table.c:408
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:409
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:410
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:411
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:412
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:356
+#: calendar/gui/e-calendar-table.c:413
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:357
+#: calendar/gui/e-calendar-table.c:414
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:358
+#: calendar/gui/e-calendar-table.c:415
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:359
+#: calendar/gui/e-calendar-table.c:416
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:360
+#: calendar/gui/e-calendar-table.c:417
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3441
-#: calendar/gui/e-week-view.c:3288 mail/folder-browser.c:1283
-#: shell/e-shortcuts-view.c:383
+#: calendar/gui/e-calendar-table.c:914 calendar/gui/e-day-view.c:3443
+#: calendar/gui/e-week-view.c:3296 mail/folder-browser.c:1371
+#: shell/e-shortcuts-view.c:385
 msgid "_Open"
 msgstr "Ati_daryti"
 
-#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3450
-#: calendar/gui/e-week-view.c:3297 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:918 calendar/gui/e-day-view.c:3452
+#: calendar/gui/e-week-view.c:3305 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:856 calendar/gui/e-day-view.c:3452
-#: calendar/gui/e-week-view.c:3299 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:920 calendar/gui/e-day-view.c:3454
+#: calendar/gui/e-week-view.c:3307 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:14
 msgid "_Copy"
 msgstr "_Kopijuoti"
 
-#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3427
-#: calendar/gui/e-day-view.c:3454 calendar/gui/e-week-view.c:3275
-#: calendar/gui/e-week-view.c:3301 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:922 calendar/gui/e-day-view.c:3429
+#: calendar/gui/e-day-view.c:3456 calendar/gui/e-week-view.c:3283
+#: calendar/gui/e-week-view.c:3309 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:40 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:17
 msgid "_Paste"
 msgstr "�_d�ti"
 
-#: calendar/gui/e-calendar-table.c:863
+#: calendar/gui/e-calendar-table.c:927
 msgid "_Mark as Complete"
 msgstr "_Pa�ym�ti u�baigta"
 
-#: calendar/gui/e-calendar-table.c:865
+#: calendar/gui/e-calendar-table.c:929
 msgid "_Delete this Task"
 msgstr "_I�trinti �i� u�duot�"
 
-#: calendar/gui/e-calendar-table.c:868
+#: calendar/gui/e-calendar-table.c:932
 msgid "_Mark Tasks as Complete"
 msgstr "_Pa�ym�ti u�duotis u�baigtomis"
 
-#: calendar/gui/e-calendar-table.c:870
+#: calendar/gui/e-calendar-table.c:934
 msgid "_Delete Selected Tasks"
 msgstr "_I�trinti pa�ym�tas u�duotis"
 
-#: calendar/gui/e-calendar-table.c:1130
+#: calendar/gui/e-calendar-table.c:1194
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Spausk �ia, kad prid�tum u�duot�"
@@ -4287,8 +4339,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:699
-#: camel/camel-filter-driver.c:815
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:718
+#: camel/camel-filter-driver.c:834
 msgid "Complete"
 msgstr "U�baigta"
 
@@ -4319,8 +4371,8 @@ 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:30 shell/e-shortcuts.c:1051
-#: shell/e-storage-set-view.c:1418
+#: my-evolution/component-factory.c:45 shell/e-shortcuts.c:1050
+#: shell/e-storage-set-view.c:1420 shell/e-summary-storage.c:80
 msgid "Summary"
 msgstr "Ap�valga"
 
@@ -4340,7 +4392,7 @@ 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:285 calendar/gui/e-day-view.c:1374
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
 msgid "%A %d %B"
 msgstr "%A, %B %e"
 
@@ -4352,223 +4404,296 @@ 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:608 calendar/gui/e-week-view.c:344
-#: calendar/gui/print.c:759
+#: calendar/gui/e-day-view.c:608 calendar/gui/e-week-view.c:345
+#: calendar/gui/print.c:769
 msgid "am"
 msgstr " "
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:347
-#: calendar/gui/print.c:761
+#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:348
+#: calendar/gui/print.c:771
 msgid "pm"
 msgstr " "
 
-#: calendar/gui/e-day-view.c:3422 calendar/gui/e-week-view.c:3270
+#: calendar/gui/e-day-view.c:3424 calendar/gui/e-week-view.c:3278
 msgid "New All Day _Event"
 msgstr "Naujas visos _dienos �vykis"
 
-#: calendar/gui/e-day-view.c:3432 calendar/gui/e-week-view.c:3280
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3288
 #: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "Eiti � �ia_ndien�"
 
-#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3282
+#: calendar/gui/e-day-view.c:3436 calendar/gui/e-week-view.c:3290
 msgid "_Go to Date..."
 msgstr "_Eiti � dat�..."
 
-#: calendar/gui/e-day-view.c:3443 calendar/gui/e-week-view.c:3290
+#: calendar/gui/e-day-view.c:3445 calendar/gui/e-week-view.c:3298
 msgid "_Delete this Appointment"
 msgstr "_I�trinti �� �vyk�"
 
-#: calendar/gui/e-day-view.c:3462 calendar/gui/e-week-view.c:3315
+#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3323
 msgid "Make this Occurrence _Movable"
 msgstr "Leisti per_kelti �� pasitaikym�"
 
-#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3317
+#: calendar/gui/e-day-view.c:3466 calendar/gui/e-week-view.c:3325
 msgid "Delete this _Occurrence"
 msgstr "I�trinti �� _pasitaikym�"
 
-#: calendar/gui/e-day-view.c:3466 calendar/gui/e-week-view.c:3319
+#: calendar/gui/e-day-view.c:3468 calendar/gui/e-week-view.c:3327
 msgid "Delete _All Occurrences"
 msgstr "I�trinti _visus pasitaikymus"
 
-#: calendar/gui/e-itip-control.c:617
+#: calendar/gui/e-itip-control.c:469
+msgid "Meeting begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:474
+msgid "Task begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:479
+#, fuzzy
+msgid "Free/Busy info begins: <b>"
+msgstr "Laisvumo/U�imtumo informacija"
+
+#: calendar/gui/e-itip-control.c:483
+msgid "Begins: <b>"
+msgstr ""
+
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:677
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:692
+#, c-format
+msgid "<b>Summary:</b> %s<br><br>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:692
+msgid "<i>None</i>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:702
+#, fuzzy, c-format
+msgid "<b>Description:</b> %s"
+msgstr "Apra�ymas:"
+
+#: calendar/gui/e-itip-control.c:737
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> paskelb� susitikimo informacij�."
 
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:738
 msgid "Meeting Information"
 msgstr "Susitikimo informacija"
 
-#: calendar/gui/e-itip-control.c:622
+#: calendar/gui/e-itip-control.c:742
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> pra�o, kad tu dalyvautum susitikime."
 
-#: calendar/gui/e-itip-control.c:623
+#: calendar/gui/e-itip-control.c:743
 msgid "Meeting Proposal"
 msgstr "Susitikimo pasi�lymas"
 
-#: calendar/gui/e-itip-control.c:627
+#: calendar/gui/e-itip-control.c:747
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> nori papildyti egzistuojant� susitikim�."
 
-#: calendar/gui/e-itip-control.c:628
+#: calendar/gui/e-itip-control.c:748
 msgid "Meeting Update"
 msgstr "Susitikimo atnaujinimas"
 
-#: calendar/gui/e-itip-control.c:632
+#: calendar/gui/e-itip-control.c:752
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> nori gauti naujausi� susitikimo informacij�."
 
-#: calendar/gui/e-itip-control.c:633
+#: calendar/gui/e-itip-control.c:753
 msgid "Meeting Update Request"
 msgstr "Susitikimo atnaujinimo pra�ymas"
 
-#: calendar/gui/e-itip-control.c:637
+#: calendar/gui/e-itip-control.c:757
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> atsak� � susitikimo u�klaus�."
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:758
 msgid "Meeting Reply"
 msgstr "Susitikimo atsakymas"
 
-#: calendar/gui/e-itip-control.c:642
+#: calendar/gui/e-itip-control.c:762
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> at�auk� susitikim�."
 
-#: calendar/gui/e-itip-control.c:643
+#: calendar/gui/e-itip-control.c:763
 msgid "Meeting Cancellation"
 msgstr "Susitikimo at�aukimas"
 
-#: calendar/gui/e-itip-control.c:647 calendar/gui/e-itip-control.c:695
-#: calendar/gui/e-itip-control.c:728
+#: calendar/gui/e-itip-control.c:767 calendar/gui/e-itip-control.c:815
+#: calendar/gui/e-itip-control.c:848
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:648
+#: calendar/gui/e-itip-control.c:768
 msgid "Bad Meeting Message"
 msgstr "Blogas susitikimo prane�imas"
 
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:785
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> paskelb� informacij� apie u�duot�."
 
-#: calendar/gui/e-itip-control.c:666
+#: calendar/gui/e-itip-control.c:786
 msgid "Task Information"
 msgstr "U�duoties informacija"
 
-#: calendar/gui/e-itip-control.c:670
+#: calendar/gui/e-itip-control.c:790
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> pra�o, kad tu atliktum u�duot�."
 
-#: calendar/gui/e-itip-control.c:671
+#: calendar/gui/e-itip-control.c:791
 msgid "Task Proposal"
 msgstr "U�duoties pasi�lymas"
 
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> nor�t� papildyti esan�i� u�duot�."
 
-#: calendar/gui/e-itip-control.c:676
+#: calendar/gui/e-itip-control.c:796
 msgid "Task Update"
 msgstr "U�duoties atnaujinimas"
 
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:800
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> nori gauti naujausi� informacij� apie u�duot�."
 
-#: calendar/gui/e-itip-control.c:681
+#: calendar/gui/e-itip-control.c:801
 msgid "Task Update Request"
 msgstr "U�duoties atnaujinimo pra�ymas"
 
-#: calendar/gui/e-itip-control.c:685
+#: calendar/gui/e-itip-control.c:805
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> atsak� � u�duoties priskyrim�."
 
-#: calendar/gui/e-itip-control.c:686
+#: calendar/gui/e-itip-control.c:806
 msgid "Task Reply"
 msgstr "U�duoties atsakymas"
 
-#: calendar/gui/e-itip-control.c:690
+#: calendar/gui/e-itip-control.c:810
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> at�auk� u�duot�."
 
-#: calendar/gui/e-itip-control.c:691
+#: calendar/gui/e-itip-control.c:811
 msgid "Task Cancellation"
 msgstr "U�duoties at�aukimas"
 
-#: calendar/gui/e-itip-control.c:696
+#: calendar/gui/e-itip-control.c:816
 msgid "Bad Task Message"
 msgstr "Bloga u�duoties �inut�"
 
-#: calendar/gui/e-itip-control.c:713
+#: calendar/gui/e-itip-control.c:833
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> paskelb� laisvumo/u�imtumo informacij�."
 
-#: calendar/gui/e-itip-control.c:714
+#: calendar/gui/e-itip-control.c:834
 msgid "Free/Busy Information"
 msgstr "Laisvumo/U�imtumo informacija"
 
-#: calendar/gui/e-itip-control.c:718
+#: calendar/gui/e-itip-control.c:838
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> pra�o tavo laisvumo/u�imtumo informacijos."
 
-#: calendar/gui/e-itip-control.c:719
+#: calendar/gui/e-itip-control.c:839
 msgid "Free/Busy Request"
 msgstr "Laisvumo/U�simtumo u�klausa"
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:843
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> atsak� � laisvumo/u�imtumo u�klaus�."
 
-#: calendar/gui/e-itip-control.c:724
+#: calendar/gui/e-itip-control.c:844
 msgid "Free/Busy Reply"
 msgstr "Laisvumo/U�imtumo atsakymas"
 
-#: calendar/gui/e-itip-control.c:729
+#: calendar/gui/e-itip-control.c:849
 msgid "Bad Free/Busy Message"
 msgstr "Bloga laisvumo/u�imtumo �inut�"
 
-#: calendar/gui/e-itip-control.c:940
-msgid "I couldn't update your calendar file!\n"
-msgstr "A� negal�jau atnaujinti tavo kalendoriaus bylos!\n"
+#: calendar/gui/e-itip-control.c:916
+msgid "The message does not appear to be properly formed"
+msgstr "Atrodo, kad �is lai�kas yra blogai suformuotas"
 
-#: calendar/gui/e-itip-control.c:942
+#: calendar/gui/e-itip-control.c:935
+#, fuzzy
+msgid "The message contains only unsupported requests."
+msgstr "�iame lai�ke yra tik Bcc gav�jai."
+
+#: calendar/gui/e-itip-control.c:963 calendar/gui/e-itip-control.c:969
+msgid "The attachment does not contain a valid calendar message"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1088
+#, fuzzy
+msgid "Calendar file could not be updated!\n"
+msgstr "Elementas negal�jo b�ti i�si�stas!\n"
+
+#: calendar/gui/e-itip-control.c:1090
 msgid "Update complete\n"
 msgstr "Atnaujinimas u�baigtas\n"
 
-#: calendar/gui/e-itip-control.c:967
+#: calendar/gui/e-itip-control.c:1134
+msgid "Attendee status could not be updated because of an invalid status!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1142
+msgid "Attendee status ould not be updated!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1144
+#, fuzzy
+msgid "Attendee status updated\n"
+msgstr "Dalyvio adresas"
+
+#: calendar/gui/e-itip-control.c:1146
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1174
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "A� negal�jau i�trinti elemento i� tavo kalendoriaus bylos!\n"
 
-#: calendar/gui/e-itip-control.c:969
+#: calendar/gui/e-itip-control.c:1176
 msgid "Removal Complete"
 msgstr "Pa�alinimas u�baigtas"
 
-#: calendar/gui/e-itip-control.c:1001 calendar/gui/e-itip-control.c:1029
+#: calendar/gui/e-itip-control.c:1208 calendar/gui/e-itip-control.c:1242
 msgid "Item sent!\n"
 msgstr "Elementas i�si�stas!\n"
 
-#: calendar/gui/e-itip-control.c:1003 calendar/gui/e-itip-control.c:1031
+#: calendar/gui/e-itip-control.c:1210 calendar/gui/e-itip-control.c:1246
 msgid "The item could not be sent!\n"
 msgstr "Elementas negal�jo b�ti i�si�stas!\n"
 
+#: calendar/gui/e-itip-control.c:1406
+msgid "Unable to find any of your identities in the attendees list!\n"
+msgstr ""
+
 #: calendar/gui/e-itip-control.glade.h:2
 #, fuzzy, no-c-format
 msgid "%P %%"
@@ -4606,6 +4731,169 @@ msgstr "pabaigos-data"
 msgid "date-start"
 msgstr "prad�ios-data"
 
+#: calendar/gui/e-meeting-model.c:201 calendar/gui/e-meeting-model.c:218
+#: calendar/gui/e-meeting-model.c:502 calendar/gui/e-meeting-model.c:670
+msgid "Individual"
+msgstr "Individas"
+
+#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
+#: calendar/gui/e-meeting-model.c:671
+msgid "Group"
+msgstr "Grup�"
+
+#: calendar/gui/e-meeting-model.c:205 calendar/gui/e-meeting-model.c:222
+#: calendar/gui/e-meeting-model.c:672
+msgid "Resource"
+msgstr "Resursas"
+
+#: calendar/gui/e-meeting-model.c:207 calendar/gui/e-meeting-model.c:224
+#: calendar/gui/e-meeting-model.c:673
+msgid "Room"
+msgstr "Kambarys"
+
+#: calendar/gui/e-meeting-model.c:226 calendar/gui/e-meeting-model.c:261
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:674
+#: calendar/gui/e-meeting-model.c:690
+#: camel/providers/smtp/camel-smtp-transport.c:224
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
+msgid "Unknown"
+msgstr "Ne�inomas"
+
+#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
+#: calendar/gui/e-meeting-model.c:686
+msgid "Chair"
+msgstr "Pirmininkas"
+
+#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
+#: calendar/gui/e-meeting-model.c:504 calendar/gui/e-meeting-model.c:687
+msgid "Required Participant"
+msgstr "B�tinas dalyvis"
+
+#: calendar/gui/e-meeting-model.c:240 calendar/gui/e-meeting-model.c:257
+#: calendar/gui/e-meeting-model.c:688
+msgid "Optional Participant"
+msgstr "Neb�tinas dalyvis"
+
+#: calendar/gui/e-meeting-model.c:242 calendar/gui/e-meeting-model.c:259
+#: calendar/gui/e-meeting-model.c:689
+msgid "Non-Participant"
+msgstr "Ne dalyvis"
+
+#: calendar/gui/e-meeting-model.c:288 calendar/gui/e-meeting-model.c:311
+#: calendar/gui/e-meeting-model.c:512 calendar/gui/e-meeting-model.c:715
+msgid "Needs Action"
+msgstr "Reikalauja veiksmo"
+
+#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
+#: calendar/gui/e-meeting-model.c:716
+msgid "Accepted"
+msgstr "Priimtas"
+
+#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
+#: calendar/gui/e-meeting-model.c:717
+msgid "Declined"
+msgstr "Atmestas"
+
+#: calendar/gui/e-meeting-model.c:294 calendar/gui/e-meeting-model.c:317
+#: calendar/gui/e-meeting-model.c:718 calendar/gui/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr "Negalutinis"
+
+#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
+#: calendar/gui/e-meeting-model.c:719
+msgid "Delegated"
+msgstr "Pavestas"
+
+#: calendar/gui/e-meeting-model.c:300 calendar/gui/e-meeting-model.c:323
+msgid "In Process"
+msgstr "Vykdomas"
+
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:472
+#: calendar/gui/e-meeting-time-sel.c:1937
+msgid "%A, %B %d, %Y"
+msgstr "%A, %Y m. %B %e"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:476
+#: calendar/gui/e-meeting-time-sel.c:1965 e-util/e-time-utils.c:186
+#: e-util/e-time-utils.c:345
+msgid "%a %m/%d/%Y"
+msgstr "%a %Y-%m-%d"
+
+#. This is a strftime() format string %m = month number,
+#. %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:480 e-util/e-time-utils.c:221
+#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1577
+msgid "%m/%d/%Y"
+msgstr "%Y-%m-%d"
+
+#: calendar/gui/e-meeting-time-sel.c:394
+msgid "Out of Office"
+msgstr "Nesu darbe"
+
+#: calendar/gui/e-meeting-time-sel.c:395
+msgid "No Information"
+msgstr "N�ra informacijos"
+
+#: calendar/gui/e-meeting-time-sel.c:411
+msgid "_Invite Others..."
+msgstr "Pakv_iesti kitus..."
+
+#: calendar/gui/e-meeting-time-sel.c:431
+msgid "_Options"
+msgstr "_Parinktys"
+
+#: calendar/gui/e-meeting-time-sel.c:448
+msgid "Show _Only Working Hours"
+msgstr "Rodyti tik _darbo valandas"
+
+#: calendar/gui/e-meeting-time-sel.c:461
+msgid "Show _Zoomed Out"
+msgstr "Rodyti _atitraukt�"
+
+#: calendar/gui/e-meeting-time-sel.c:479
+msgid "_Update Free/Busy"
+msgstr "_Atnaujinti Laisvas/U�imtas"
+
+#: calendar/gui/e-meeting-time-sel.c:497
+msgid "_<<"
+msgstr "_<<"
+
+#: calendar/gui/e-meeting-time-sel.c:514
+msgid "_Autopick"
+msgstr "_Automati�kai parinkti"
+
+#: calendar/gui/e-meeting-time-sel.c:528
+msgid ">_>"
+msgstr ">_>"
+
+#: calendar/gui/e-meeting-time-sel.c:545
+msgid "_All People and Resources"
+msgstr "_Visi �mon�s ir resursai"
+
+#: calendar/gui/e-meeting-time-sel.c:558
+msgid "All _People and One Resource"
+msgstr "Visi �_mon�s ir vienas resursas"
+
+#: calendar/gui/e-meeting-time-sel.c:571
+msgid "_Required People"
+msgstr "_B�tini �mon�s"
+
+#: calendar/gui/e-meeting-time-sel.c:584
+msgid "Required People and _One Resource"
+msgstr "B�tini �mon�s ir _vienas resursas"
+
+#: calendar/gui/e-meeting-time-sel.c:607
+msgid "Meeting _start time:"
+msgstr "Susitikimo _prad�ios laikas:"
+
+#: calendar/gui/e-meeting-time-sel.c:626
+msgid "Meeting _end time:"
+msgstr "Susitikimo pa_baigos laikas:"
+
 #: calendar/gui/e-tasks.c:349
 #, c-format
 msgid "Could not load the tasks in `%s'"
@@ -4616,16 +4904,16 @@ msgstr "Negal�jau �kelti u�duo�i� � �%s�"
 msgid "The method required to load `%s' is not supported"
 msgstr "Metodas, reikalingas �kelti �%s�, nepalaikomas"
 
-#: calendar/gui/e-week-view.c:3268 calendar/gui/e-week-view.c:3306
+#: calendar/gui/e-week-view.c:3276 calendar/gui/e-week-view.c:3314
 msgid "New _Appointment..."
 msgstr "Naujas �_vykis..."
 
-#: calendar/gui/gnome-cal.c:1318
+#: calendar/gui/gnome-cal.c:1319
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Negal�jau atidaryti aplanko su �%s�"
 
-#: calendar/gui/gnome-cal.c:1329
+#: calendar/gui/gnome-cal.c:1330
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metodas, reikalingas atidaryti �%s�, nepalaikomas"
@@ -4686,7 +4974,7 @@ msgstr "Spalis"
 msgid "September"
 msgstr "Rugs�jis"
 
-#: calendar/gui/itip-utils.c:254
+#: calendar/gui/itip-utils.c:274
 msgid "An organizer must be set."
 msgstr "Turi b�ti nurodytas organizatorius."
 
@@ -4695,201 +4983,201 @@ msgstr "Turi b�ti nurodytas organizatorius."
 msgid "Could not create the component editor factory"
 msgstr "Negal�jau sukurti laikino katalogo: %s"
 
-#: calendar/gui/print.c:422
+#: calendar/gui/print.c:426
 msgid "1st"
 msgstr "1-a"
 
-#: calendar/gui/print.c:422
+#: calendar/gui/print.c:426
 msgid "2nd"
 msgstr "2-a"
 
-#: calendar/gui/print.c:422
+#: calendar/gui/print.c:426
 msgid "3rd"
 msgstr "3-a"
 
-#: calendar/gui/print.c:422
+#: calendar/gui/print.c:426
 msgid "4th"
 msgstr "4-a"
 
-#: calendar/gui/print.c:422
+#: calendar/gui/print.c:426
 msgid "5th"
 msgstr "5-a"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:427
 msgid "6th"
 msgstr "6-ta"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:427
 msgid "7th"
 msgstr "7-ta"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:427
 msgid "8th"
 msgstr "8-ta"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:427
 msgid "9th"
 msgstr "9-ta"
 
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:427
 msgid "10th"
 msgstr "10-ta"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:428
 msgid "11th"
 msgstr "11-ta"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:428
 msgid "12th"
 msgstr "12-ta"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:428
 msgid "13th"
 msgstr "13-ta"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:428
 msgid "14th"
 msgstr "14-ta"
 
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:428
 msgid "15th"
 msgstr "15-ta"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:429
 msgid "16th"
 msgstr "16-ta"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:429
 msgid "17th"
 msgstr "17-ta"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:429
 msgid "18th"
 msgstr "18-ta"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:429
 msgid "19th"
 msgstr "19-ta"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:429
 msgid "20th"
 msgstr "20-ta"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:430
 msgid "21st"
 msgstr "21-a"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:430
 msgid "22nd"
 msgstr "22-a"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:430
 msgid "23rd"
 msgstr "23-a"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:430
 msgid "24th"
 msgstr "24-ta"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:430
 msgid "25th"
 msgstr "25-ta"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:431
 msgid "26th"
 msgstr "26-ta"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:431
 msgid "27th"
 msgstr "27-ta"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:431
 msgid "28th"
 msgstr "28-ta"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:431
 msgid "29th"
 msgstr "29-ta"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:431
 msgid "30th"
 msgstr "30-ta"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:432
 msgid "31st"
 msgstr "31-a"
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:499
 msgid "Su"
 msgstr "Sk"
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:499
 msgid "Mo"
 msgstr "Pr"
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:499
 msgid "Tu"
 msgstr "An"
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:499
 msgid "We"
 msgstr "Tr"
 
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:500
 msgid "Th"
 msgstr "Kt"
 
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:500
 msgid "Fr"
 msgstr "Pn"
 
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:500
 msgid "Sa"
 msgstr "�t"
 
 #. Day
-#: calendar/gui/print.c:1815
+#: calendar/gui/print.c:1831
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Pasirinkta diena (%a, %Y %d %b)"
 
-#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
+#: calendar/gui/print.c:1850 calendar/gui/print.c:1854
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1835
+#: calendar/gui/print.c:1851
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1846
+#: calendar/gui/print.c:1862
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Pasirinkta savait� (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1854
+#: calendar/gui/print.c:1870
 msgid "Selected month (%b %Y)"
 msgstr "Pasirinktas m�nuo (%Y %b)"
 
 #. Year
-#: calendar/gui/print.c:1861
+#: calendar/gui/print.c:1877
 msgid "Selected year (%Y)"
 msgstr "Pasirinkti metai (%Y)"
 
-#: calendar/gui/print.c:2200
+#: calendar/gui/print.c:2221
 msgid "Print Calendar"
 msgstr "Spausdinti kalendori�"
 
-#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
-#: mail/mail-callbacks.c:1933 my-evolution/e-summary.c:511
+#: calendar/gui/print.c:2312 calendar/gui/print.c:2404
+#: mail/mail-callbacks.c:2080 my-evolution/e-summary.c:607
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
 msgstr "Spaudinio per�i�ra"
 
-#: calendar/gui/print.c:2317
+#: calendar/gui/print.c:2341
 msgid "Print Item"
 msgstr "Spausdinti element�"
 
-#: calendar/gui/print.c:2398
+#: calendar/gui/print.c:2422
 msgid "Print Setup"
 msgstr "Spausdinimo nuostatos"
 
@@ -4927,8 +5215,8 @@ msgstr ""
 #: calendar/gui/tasks-migrate.c:134
 #, 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 ""
 
 #: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
@@ -5009,8 +5297,8 @@ msgstr ""
 
 #: calendar/pcs/query.c:675
 msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", "
-"\"description\""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
 msgstr ""
 
 #: calendar/pcs/query.c:717
@@ -5028,7 +5316,17 @@ msgstr ""
 msgid "is-completed? expects 0 arguments"
 msgstr "Sintakses klaida parametruose arba argumentuose"
 
-#: calendar/pcs/query.c:1085
+#: calendar/pcs/query.c:862
+#, fuzzy
+msgid "completed-before? expects 1 argument"
+msgstr "Sintakses klaida parametruose arba argumentuose"
+
+#: calendar/pcs/query.c:867
+#, fuzzy
+msgid "completed-before? expects argument 1 to be a time_t"
+msgstr "Sintakses klaida parametruose arba argumentuose"
+
+#: calendar/pcs/query.c:1155
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
@@ -5077,67 +5375,84 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr "V�l sinchronizuojama su serveriu"
 
-#: camel/camel-disco-store.c:305
+#: camel/camel-disco-store.c:336
 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:533 camel/camel-filter-driver.c:542
+#: camel/camel-filter-driver.c:549 camel/camel-filter-driver.c:558
 msgid "Syncing folders"
 msgstr "Sinchronizuojami aplankai"
 
-#: camel/camel-filter-driver.c:644
+#: camel/camel-filter-driver.c:659
 msgid "Unable to open spool folder"
 msgstr "Negaliu atidaryti kaupo aplanko"
 
-#: camel/camel-filter-driver.c:653
+#: camel/camel-filter-driver.c:668
 #, fuzzy
 msgid "Unable to process spool folder"
 msgstr "Negaliu procesinti kaupo aplanko"
 
-#: camel/camel-filter-driver.c:667
+#: camel/camel-filter-driver.c:683
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Gaunamas lai�kas %d (%d%%)"
 
-#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
+#: camel/camel-filter-driver.c:687 camel/camel-filter-driver.c:700
 #, c-format
 msgid "Failed on message %d"
 msgstr "Nes�km� ties lai�ku %d"
 
-#: camel/camel-filter-driver.c:672
+#: camel/camel-filter-driver.c:688
 msgid "Cannot open message"
 msgstr "Negaliu atidaryti lai�ko"
 
-#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
+#: camel/camel-filter-driver.c:714 camel/camel-filter-driver.c:829
 msgid "Syncing folder"
 msgstr "Sinchronizuojamas aplankas"
 
-#: camel/camel-filter-driver.c:766
+#: camel/camel-filter-driver.c:786
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Gaunamas lai�kas %d i� %d"
 
-#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
+#: camel/camel-filter-driver.c:791 camel/camel-filter-driver.c:809
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Nes�km� ties lai�ku %d i� %d"
 
-#: camel/camel-filter-driver.c:892
+#: camel/camel-filter-driver.c:918
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Klaida nagrin�jant filtr�: %s: %s"
 
-#: camel/camel-filter-driver.c:898
+#: camel/camel-filter-driver.c:924
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Klaida vykdant filtr�: %s: %s"
 
-#: camel/camel-filter-search.c:468 camel/camel-filter-search.c:475
+#: camel/camel-filter-search.c:494 camel/camel-filter-search.c:501
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Klaida vykdant filtro paie�k�: %s: %s"
 
-#: camel/camel-folder-search.c:328
+#: camel/camel-folder.c:472
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1039
+#, fuzzy, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr ""
+"Klaida vykdant paie�kos i�rai�k� �%s�:\n"
+"%s"
+
+#: camel/camel-folder.c:1219
+#, fuzzy
+msgid "Moving messages"
+msgstr "Kopijuojami lai�kai"
+
+#: camel/camel-folder-search.c:333
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -5146,7 +5461,7 @@ msgstr ""
 "Negaliu i�nagrin�ti paie�kos i�rai�kos: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:338
+#: camel/camel-folder-search.c:343
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -5155,16 +5470,16 @@ msgstr ""
 "Klaida vykdant paie�kos i�rai�k� �%s�:\n"
 "%s"
 
-#: camel/camel-folder-search.c:485 camel/camel-folder-search.c:513
+#: camel/camel-folder-search.c:560 camel/camel-folder-search.c:588
 msgid "(match-all) requires a single bool result"
 msgstr "(match-all) reikalauja vienintelio loginio rezultato"
 
-#: camel/camel-folder-search.c:563
+#: camel/camel-folder-search.c:638
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Vykdoma u�klausa ne�inomai antra�tei: %s"
 
-#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:716
+#: camel/camel-folder-search.c:748 camel/camel-folder-search.c:792
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
@@ -5199,12 +5514,12 @@ msgstr "Negal�jau sukurti %s u�rakto bylos: %s"
 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:201
+#: camel/camel-lock.c:205
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Nepavyko gauti u�rakto naudojant fcntl(2): %s"
 
-#: camel/camel-lock.c:255
+#: camel/camel-lock.c:267
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Nepavyko gauti u�rakto naudojant flock(2): %s"
@@ -5263,56 +5578,83 @@ 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-pgp-context.c:193
+#: camel/camel-pgp-context.c:191
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Pra�au �vesti tavo %s slapta�od� d�l %s"
 
-#: camel/camel-pgp-context.c:196
+#: camel/camel-pgp-context.c:194
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "Pra�au �vesti tavo %s slapta�od�"
 
-#: camel/camel-pgp-context.c:518
-msgid "No plaintext to sign."
-msgstr ""
+#: camel/camel-pgp-context.c:525
+#, fuzzy
+msgid "Cannot sign this message: no plaintext to sign"
+msgstr "Negaliu si�sti lai�ko: neapibr��ti jokie gav�jai."
 
-#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
-#: camel/camel-pgp-context.c:1079 camel/camel-pgp-context.c:1266
-msgid "No password provided."
-msgstr "Nepateiktas slapta�odis."
+#: camel/camel-pgp-context.c:532 camel/camel-pgp-context.c:706
+#, fuzzy
+msgid "Cannot sign this message: no password provided"
+msgstr "Negaliu si�sti lai�ko: siunt�jo adresas neteisingas."
 
-#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
-#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1086
-#: camel/camel-pgp-context.c:1273
+#: camel/camel-pgp-context.c:538 camel/camel-pgp-context.c:712
 #, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
+msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:693
-msgid "No plaintext to clearsign."
-msgstr ""
+#: camel/camel-pgp-context.c:699
+#, fuzzy
+msgid "Cannot sign this message: no plaintext to clearsign"
+msgstr "Negaliu si�sti lai�ko: neapibr��ti jokie gav�jai."
 
-#: camel/camel-pgp-context.c:886
-msgid "No plaintext to verify."
-msgstr ""
+#: camel/camel-pgp-context.c:891
+#, fuzzy
+msgid "Cannot verify this message: no plaintext to verify"
+msgstr "Negaliu si�sti lai�ko: neapibr��ti jokie gav�jai."
 
-#: camel/camel-pgp-context.c:903
+#: camel/camel-pgp-context.c:897
 #, c-format
-msgid "Couldn't create temp file: %s"
+msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
+msgstr ""
+
+#: camel/camel-pgp-context.c:908
+#, fuzzy, c-format
+msgid "Cannot verify this message: couldn't create temp file: %s"
 msgstr "Negal�jau sukurti laikinos bylos: %s"
 
-#: camel/camel-pgp-context.c:1069
+#: camel/camel-pgp-context.c:1076
 #, fuzzy
-msgid "No plaintext to encrypt."
-msgstr "Paspausk ant ikonos, kad i��ifruotum."
+msgid "Cannot encrypt this message: no plaintext to encrypt"
+msgstr "Negaliu si�sti lai�ko: neapibr��ti jokie gav�jai."
 
-#: camel/camel-pgp-context.c:1095
-msgid "No recipients specified"
-msgstr "Nenurodyti jokie gav�jai"
+#: camel/camel-pgp-context.c:1086
+#, fuzzy
+msgid "Cannot encrypt this message: no password provided"
+msgstr "Negaliu si�sti lai�ko: siunt�jo adresas neteisingas."
+
+#: camel/camel-pgp-context.c:1093
+#, c-format
+msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
+msgstr ""
+
+#: camel/camel-pgp-context.c:1102
+#, fuzzy
+msgid "Cannot encrypt this message: no recipients specified"
+msgstr "Negaliu si�sti lai�ko: neapibr��ti jokie gav�jai."
+
+#: camel/camel-pgp-context.c:1264
+#, fuzzy
+msgid "Cannot decrypt this message: no ciphertext to decrypt"
+msgstr "Negaliu si�sti lai�ko: neapibr��ti jokie gav�jai."
 
-#: camel/camel-pgp-context.c:1258
-msgid "No ciphertext to decrypt."
+#: camel/camel-pgp-context.c:1272
+msgid "Cannot decrypt this message: no password provided"
+msgstr ""
+
+#: camel/camel-pgp-context.c:1279
+#, c-format
+msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
 #: camel/camel-provider.c:131
@@ -5354,13 +5696,13 @@ msgstr "Negal�jau prisijungti prie %s (prievadas %d): %s"
 msgid "(unknown host)"
 msgstr "(ne�inomas hostas)"
 
-#: camel/camel-remote-store.c:361 camel/camel-remote-store.c:423
-#: camel/camel-remote-store.c:486
+#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
+#: camel/camel-remote-store.c:483
 #: camel/providers/imap/camel-imap-command.c:386
 msgid "Operation cancelled"
 msgstr "Veiksmas nutrauktas"
 
-#: camel/camel-remote-store.c:489
+#: camel/camel-remote-store.c:486
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Serveris netik�tai atsijung�: %s"
@@ -5418,8 +5760,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 ""
 "Su �ia parinktimi prie serverio bus jungiamasi naudojant saug� CRAM-MD5 "
 "slapta�od�, jei serveris tai palaiko."
@@ -5453,8 +5795,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 ""
 "Su �ia parinktimi jungiantis prie serverio bus naudojama Kerberos 4 "
 "autentikacija."
@@ -5467,7 +5808,7 @@ msgid ""
 msgstr "Negal�jau sukurti pipe: %s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:485
+#: camel/providers/imap/camel-imap-store.c:494
 msgid "Bad authentication response from server."
 msgstr "Blogas autentikacijos atsakymas i� serverio."
 
@@ -5487,7 +5828,7 @@ msgstr "Ne�inoma autentikacijos b�sena."
 
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:302
-#: camel/providers/pop3/camel-pop3-provider.c:68 mail/mail-config.glade.h:54
+#: camel/providers/pop3/camel-pop3-provider.c:68 mail/mail-config.glade.h:55
 msgid "Password"
 msgstr "Slapta�odis"
 
@@ -5516,55 +5857,55 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Nepavyko sukompiliuoti reguliarios i�rai�kos: %s: %s"
 
-#: camel/camel-service.c:154
+#: camel/camel-service.c:157
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL �%s� turi b�ti su vartotojo vardu"
 
-#: camel/camel-service.c:162
+#: camel/camel-service.c:165
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL �%s� turi b�ti su hostu"
 
-#: camel/camel-service.c:170
+#: camel/camel-service.c:173
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL �%s� turi b�ti su keliu"
 
-#: camel/camel-service.c:548
+#: camel/camel-service.c:602
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:575
+#: camel/camel-service.c:629
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:600
+#: camel/camel-service.c:654
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:602
+#: camel/camel-service.c:656
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-session.c:68
+#: camel/camel-session.c:76
 msgid "Virtual folder email provider"
 msgstr "Virtuali� aplank� pa�to tiek�jas."
 
-#: camel/camel-session.c:70
+#: camel/camel-session.c:78
 msgid "For reading mail as a query of another set of folders"
 msgstr "Pa�to skaitymui naudojant u�klaus� i� kit� aplank� aib�s"
 
-#: camel/camel-session.c:297 camel/camel-session.c:366
+#: camel/camel-session.c:324 camel/camel-session.c:393
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Protokolui �%s� n�ra tiek�jo."
 
-#: camel/camel-session.c:483
+#: camel/camel-session.c:510
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -5610,7 +5951,12 @@ msgstr "Nepavyko i�koduoti lai�ko."
 msgid "Failed to verify certificates."
 msgstr "Nepavyko patikrinti sertifikat�."
 
-#: camel/camel-tcp-stream-openssl.c:463
+#: camel/camel-store.c:273
+#, fuzzy
+msgid "Cannot create folder: Invalid operation on this store"
+msgstr "Negaliu sukurti aplanko u�rakto ant %s: %s"
+
+#: camel/camel-tcp-stream-openssl.c:491
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -5618,7 +5964,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:369
+#: camel/camel-tcp-stream-openssl.c:496 camel/camel-tcp-stream-ssl.c:369
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -5657,16 +6003,40 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Negal�jau i�nagrin�ti URL �%s�"
 
-#: camel/camel-vee-folder.c:452
+#: camel/camel-vee-folder.c:554
 #, c-format
 msgid "No such message %s in %s"
 msgstr "N�ra tokio lai�ko %s aplanke %s"
 
-#: camel/camel-vee-folder.c:547
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message: %s"
 msgstr "N�ra tokio lai�ko: %s"
 
+#: camel/camel-vee-store.c:250
+#, fuzzy, c-format
+msgid "Cannot delete folder: %s: Invalid operation"
+msgstr ""
+"Negal�jau i�trinti aplanko:\n"
+"%s"
+
+#: camel/camel-vee-store.c:286
+#, fuzzy, c-format
+msgid "Cannot delete folder: %s: No such folder"
+msgstr ""
+"Negal�jau i�trinti aplanko:\n"
+"%s"
+
+#: camel/camel-vee-store.c:298
+#, fuzzy, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "Negal�jau pervadinti aplanko: %s"
+
+#: camel/camel-vee-store.c:326
+#, fuzzy, c-format
+msgid "Cannot rename folder: %s: No such folder"
+msgstr "Negal�jau pervadinti aplanko �%s� � %s: %s"
+
 #: camel/camel-vtrash-folder.c:109
 msgid "You cannot copy messages from this trash folder."
 msgstr "Tu negali kopijuoti lai�k� i� �io �iuk�li� aplanko."
@@ -5695,40 +6065,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:190
+#: camel/providers/imap/camel-imap-folder.c:189
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Negal�jau sukurti katalogo %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:209
+#: camel/providers/imap/camel-imap-folder.c:208
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Nepavyko �kelti %s santraukos"
 
-#: camel/providers/imap/camel-imap-folder.c:273
+#: camel/providers/imap/camel-imap-folder.c:272
 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:435
+#: camel/providers/imap/camel-imap-folder.c:434
 msgid "Scanning for changed messages"
 msgstr "Ie�koma pakeist� lai�k�"
 
 #: camel/providers/imap/camel-imap-folder.c:1491
-#: camel/providers/imap/camel-imap-folder.c:1968
+#: camel/providers/imap/camel-imap-folder.c:1899
 msgid "This message is not currently available"
 msgstr "�is lai�kas �iuo metu nepasiekiamas"
 
-#: camel/providers/imap/camel-imap-folder.c:1634
-#: camel/providers/imap/camel-imap-folder.c:1715
+#: camel/providers/imap/camel-imap-folder.c:1633
+#: camel/providers/imap/camel-imap-folder.c:1714
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1640
+#: camel/providers/imap/camel-imap-folder.c:1639
 msgid "Scanning for new messages"
 msgstr "Ie�koma nauj� lai�k�"
 
-#: camel/providers/imap/camel-imap-folder.c:2001
+#: camel/providers/imap/camel-imap-folder.c:1936
 msgid "Could not find message body in FETCH response."
 msgstr "Negal�jau rasti lai�ko teksto FETCH atsakyme"
 
@@ -5737,7 +6107,15 @@ msgstr "Negal�jau rasti lai�ko teksto FETCH atsakyme"
 msgid "Could not open cache directory: %s"
 msgstr "Negal�jau sukurti katalogo %s: %s"
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:14
+#: camel/providers/imap/camel-imap-message-cache.c:243
+#: camel/providers/imap/camel-imap-message-cache.c:299
+#: camel/providers/imap/camel-imap-message-cache.c:330
+#: camel/providers/imap/camel-imap-message-cache.c:362
+#, fuzzy, c-format
+msgid "Failed to cache message %s: %s"
+msgstr "Nepavyko i�koduoti lai�ko."
+
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:15
 msgid "Checking for new mail"
 msgstr "Tikrinama, ar yra nauj� lai�k�"
 
@@ -5745,7 +6123,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:750
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:767
 msgid "Folders"
 msgstr "Aplankai"
 
@@ -5774,34 +6152,33 @@ msgid "For reading and storing mail on IMAP servers."
 msgstr "Pa�to skaitymui ir ra�ymui IMAP serveriuose."
 
 #: 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 ""
 "Su �ia parinktimi jungiantis prie IMAP serverio bus naudojamas paprasto "
 "teksto slapta�odis."
 
-#: camel/providers/imap/camel-imap-store.c:508
+#: camel/providers/imap/camel-imap-store.c:517
 #, 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:518
+#: camel/providers/imap/camel-imap-store.c:527
 #: camel/providers/smtp/camel-smtp-transport.c:388
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Nepalaikoma %s tipo autentikacija"
 
-#: camel/providers/imap/camel-imap-store.c:542
+#: camel/providers/imap/camel-imap-store.c:551
 #, 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:557
+#: camel/providers/imap/camel-imap-store.c:566
 #: camel/providers/smtp/camel-smtp-transport.c:432
 msgid "You didn't enter a password."
 msgstr "Tu ne�vedei slapta�od�io."
 
-#: camel/providers/imap/camel-imap-store.c:583
+#: camel/providers/imap/camel-imap-store.c:592
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -5811,12 +6188,12 @@ msgstr ""
 "Negal�jau autentikuotis � IMAP server�.\n"
 "%s\n"
 
-#: camel/providers/imap/camel-imap-store.c:882
+#: camel/providers/imap/camel-imap-store.c:891
 #, c-format
 msgid "No such folder %s"
 msgstr "N�ra tokio aplanko %s"
 
-#: camel/providers/imap/camel-imap-store.c:1083
+#: camel/providers/imap/camel-imap-store.c:1131
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "T�vinis aplankas negali tur�ti vaikini� aplank�"
 
@@ -5840,83 +6217,88 @@ msgid "For retrieving local mail from standard mbox formated spools."
 msgstr "Vietinio pa�to laikymui standartiniu mbox formatu"
 
 #: camel/providers/local/camel-local-provider.c:60
+#, fuzzy
+msgid "Apply filters to new messages in INBOX"
+msgstr "Pritaikyti filtrus naujiems lai�kams �io serverio INBOX aplanke"
+
+#: camel/providers/local/camel-local-provider.c:66
 msgid "Qmail maildir-format mail files"
 msgstr "Qmail maildir formato pa�to bylos"
 
-#: camel/providers/local/camel-local-provider.c:61
+#: camel/providers/local/camel-local-provider.c:67
 #, fuzzy
 msgid "For storing local mail in qmail maildir directories."
 msgstr "Vietinio pa�to laikymui qmail maildir kataloguose"
 
-#: camel/providers/local/camel-local-provider.c:70
+#: camel/providers/local/camel-local-provider.c:78
 #, fuzzy
 msgid "Standard Unix mbox spools"
 msgstr "Standartin� Unix mbox"
 
-#: camel/providers/local/camel-local-provider.c:71
+#: camel/providers/local/camel-local-provider.c:79
 #, fuzzy
 msgid "For reading and storing local mail in standard mbox spool files."
 msgstr "Vietinio pa�to laikymui standartiniuose Unix spool kataloguose"
 
-#: camel/providers/local/camel-local-store.c:127
-#: camel/providers/local/camel-spool-store.c:111
+#: camel/providers/local/camel-local-store.c:132
+#: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Saugyklos �aknis %s n�ra absoliutus kelias"
 
-#: camel/providers/local/camel-local-store.c:134
+#: camel/providers/local/camel-local-store.c:139
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Saugyklos �aknis %s n�ra n�ra paprastas katalogas"
 
-#: camel/providers/local/camel-local-store.c:142
-#: camel/providers/local/camel-local-store.c:158
+#: camel/providers/local/camel-local-store.c:147
+#: camel/providers/local/camel-local-store.c:163
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Negal�jau gauti aplanko �%s�: %s"
 
-#: camel/providers/local/camel-local-store.c:173
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "Vietin�se saugyklose n�ra inbox"
 
-#: camel/providers/local/camel-local-store.c:183
+#: camel/providers/local/camel-local-store.c:190
 #, c-format
 msgid "Local mail file %s"
 msgstr "Vietin� pa�to byla %s"
 
-#: camel/providers/local/camel-local-store.c:237
+#: camel/providers/local/camel-local-store.c:247
 #, 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:279
+#: camel/providers/local/camel-local-store.c:289
 #, 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:289
+#: camel/providers/local/camel-local-store.c:299
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Negal�jau i�trinti aplanko indekso bylos �%s�: %s"
 
-#: camel/providers/local/camel-local-summary.c:417
-#: camel/providers/local/camel-spool-summary.c:1153
+#: camel/providers/local/camel-local-summary.c:418
+#: camel/providers/local/camel-spool-summary.c:1158
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Nepavyko prid�ti lai�ko � santrauk�: ne�inoma prie�astis"
 
-#: camel/providers/local/camel-maildir-folder.c:176
+#: camel/providers/local/camel-maildir-folder.c:181
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Negal�jau pridurti lai�ko prie maildir aplanko: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:201
-#: camel/providers/local/camel-maildir-folder.c:213
-#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:206
+#: camel/providers/local/camel-maildir-folder.c:218
+#: camel/providers/local/camel-maildir-folder.c:226
 #: camel/providers/local/camel-mbox-folder.c:328
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-mh-folder.c:204
 #: camel/providers/local/camel-mh-folder.c:212
-#: camel/providers/local/camel-spool-folder.c:532
+#: camel/providers/local/camel-spool-folder.c:537
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -5925,19 +6307,19 @@ msgstr ""
 "Negaliu gauti lai�ko: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:206
 #: camel/providers/local/camel-mbox-folder.c:328
 #: camel/providers/local/camel-mh-folder.c:195
-#: camel/providers/local/camel-spool-folder.c:532
+#: camel/providers/local/camel-spool-folder.c:537
 msgid "No such message"
 msgstr "N�ra tokio lai�ko"
 
-#: camel/providers/local/camel-maildir-folder.c:222
+#: camel/providers/local/camel-maildir-folder.c:227
 #: camel/providers/local/camel-mh-folder.c:213
 msgid "Invalid message contents"
 msgstr "Blogas lai�ko turinys"
 
-#: camel/providers/local/camel-maildir-store.c:103
+#: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
@@ -5947,14 +6329,14 @@ msgstr ""
 "Negal�jau atidaryti aplanko �%s�:\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "N�ra tokio aplanko �%s�."
 
-#: camel/providers/local/camel-maildir-store.c:114
+#: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
@@ -5964,23 +6346,23 @@ msgstr ""
 "Negal�jau sukurti aplanko: �%s�:\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:129
+#: camel/providers/local/camel-maildir-store.c:132
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "�%s� n�ra maildir katalogas."
 
-#: camel/providers/local/camel-maildir-store.c:165
-#: camel/providers/local/camel-maildir-store.c:202
+#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:204
 #: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Negal�jau i�trinti aplanko �%s�: %s"
 
-#: camel/providers/local/camel-maildir-store.c:166
+#: camel/providers/local/camel-maildir-store.c:168
 msgid "not a maildir directory"
 msgstr "ne maildir katalogas"
 
-#: camel/providers/local/camel-maildir-store.c:276
+#: camel/providers/local/camel-maildir-store.c:331
 #, fuzzy, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr ""
@@ -5994,13 +6376,13 @@ msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Negaliu atidaryti maildir katalogo kelio: %s: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:152
-#: camel/providers/local/camel-spool-folder.c:268
+#: camel/providers/local/camel-spool-folder.c:273
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Negaliu sukurti aplanko u�rakto ant %s: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:209
-#: camel/providers/local/camel-spool-folder.c:409
+#: camel/providers/local/camel-spool-folder.c:414
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Negaliu atidaryti pa�to d��ut�s: %s: %s\n"
@@ -6013,9 +6395,9 @@ msgstr "Negaliu pridurti lai�ko prie mbox bylos: %s: %s"
 #: camel/providers/local/camel-mbox-folder.c:344
 #: camel/providers/local/camel-mbox-folder.c:376
 #: camel/providers/local/camel-mbox-folder.c:389
-#: camel/providers/local/camel-spool-folder.c:548
-#: camel/providers/local/camel-spool-folder.c:580
-#: camel/providers/local/camel-spool-folder.c:593
+#: camel/providers/local/camel-spool-folder.c:553
+#: camel/providers/local/camel-spool-folder.c:585
+#: camel/providers/local/camel-spool-folder.c:598
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -6025,12 +6407,12 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-mbox-folder.c:377
-#: camel/providers/local/camel-spool-folder.c:581
+#: camel/providers/local/camel-spool-folder.c:586
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Atrodo, jog aplankas yra neatkuriamai sugadintas."
 
 #: camel/providers/local/camel-mbox-folder.c:390
-#: camel/providers/local/camel-spool-folder.c:594
+#: camel/providers/local/camel-spool-folder.c:599
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Nepavyko sukurti lai�ko: Sugadinta pa�to d��ut�?"
 
@@ -6076,13 +6458,20 @@ msgstr "Aplankas �%s� n�ra tu��ias. Nei�tryniau."
 #. FIXME: If there is a failure, it shouldn't clear the summary and restart,
 #. it should try and merge the summary info's.  This is a bit tricky.
 #: camel/providers/local/camel-mbox-summary.c:249
-msgid "Summarizing folder"
-msgstr "Daroma aplanko santrauka"
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:936
+#, fuzzy
+msgid "Storing folder"
+msgstr "Sinchronizuojamas aplankas"
 
 #: camel/providers/local/camel-mbox-summary.c:254
-#, c-format
-msgid "Could not open folder: %s: summarizing from position %ld: %s"
-msgstr "Negal�jau atidaryti aplanko: %s: daroma santrauka nuo vietos %ld: %s"
+#, fuzzy, c-format
+msgid "Could not open folder: %s: %s"
+msgstr ""
+"Negal�jau atidaryti bylos %s:\n"
+"%s"
 
 #: camel/providers/local/camel-mbox-summary.c:296
 #: camel/providers/local/camel-spool-summary.c:426
@@ -6091,17 +6480,9 @@ msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-summary.c:371
-#, c-format
-msgid "Cannot summarize folder: %s: %s"
-msgstr "Negal�jau padaryti aplanko santraukos: %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:644
-#: camel/providers/local/camel-spool-summary.c:931
-#, fuzzy
-msgid "Storing folder"
-msgstr "Sinchronizuojamas aplankas"
+#, fuzzy, c-format
+msgid "Cannot check folder: %s: %s"
+msgstr "Negal�jau gauti aplanko �%s�: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:507
 #: camel/providers/local/camel-mbox-summary.c:708
@@ -6124,8 +6505,8 @@ msgstr "Negal�jau atidaryti laikinos pa�to bylos: %s"
 #: camel/providers/local/camel-mbox-summary.c:754
 #: camel/providers/local/camel-spool-summary.c:698
 #: camel/providers/local/camel-spool-summary.c:706
-#: camel/providers/local/camel-spool-summary.c:974
-#: camel/providers/local/camel-spool-summary.c:982
+#: camel/providers/local/camel-spool-summary.c:979
+#: camel/providers/local/camel-spool-summary.c:987
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Santrauka ir aplankas nesutampa net po sinchronizavimo"
 
@@ -6136,14 +6517,14 @@ msgid "Error writing to temp mailbox: %s"
 msgstr "Klaida ra�ant � laikin� pa�to d��ut�: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:617
-#: camel/providers/local/camel-spool-summary.c:767
+#: camel/providers/local/camel-spool-summary.c:772
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Nepavyko ra�yti � laikin� pa�to d��ut�: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:635
 #: camel/providers/local/camel-mbox-summary.c:804
-#: camel/providers/local/camel-spool-summary.c:1032
+#: camel/providers/local/camel-spool-summary.c:1037
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Negal�jau u�daryti �altinio aplanko %s: %s"
@@ -6160,7 +6541,7 @@ msgstr "Negal�jau pervadinti aplanko: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:878
 #: camel/providers/local/camel-spool-summary.c:545
-#: camel/providers/local/camel-spool-summary.c:1106
+#: camel/providers/local/camel-spool-summary.c:1111
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Ne�inoma klaida: %s"
@@ -6180,31 +6561,31 @@ msgstr "�%s� n�ra katalogas."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Negaliu atidaryti MH katalogo kelio: %s: %s"
 
-#: camel/providers/local/camel-spool-folder.c:465
+#: camel/providers/local/camel-spool-folder.c:470
 #, c-format
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "Negaliu pridurti lai�ko prie mbox bylos: %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:132
+#: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Spool `%s' does not exist or is not a regular file"
 msgstr "Spool'as �%s� neegzistuoja arba n�ra paprasta byla."
 
-#: camel/providers/local/camel-spool-store.c:159
+#: camel/providers/local/camel-spool-store.c:142
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "N�ra tokio aplanko �%s/%s�."
 
-#: camel/providers/local/camel-spool-store.c:184
+#: camel/providers/local/camel-spool-store.c:164
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Spool pa�to byla %s"
 
-#: camel/providers/local/camel-spool-store.c:220
+#: camel/providers/local/camel-spool-store.c:210
 msgid "Spool folders cannot be renamed"
 msgstr "Spool aplank� negalima pervadinti"
 
-#: camel/providers/local/camel-spool-store.c:228
+#: camel/providers/local/camel-spool-store.c:218
 msgid "Spool folders cannot be deleted"
 msgstr "Spool aplank� negalima i�trinti"
 
@@ -6225,28 +6606,28 @@ msgstr "Negal�jau atidaryti aplanko: %s: daroma santrauka nuo vietos %ld: %s"
 msgid "Cannot summarise folder: %s: %s"
 msgstr "Negal�jau padaryti aplanko santraukos: %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:784
-#: camel/providers/local/camel-spool-summary.c:793
-#: camel/providers/local/camel-spool-summary.c:802
+#: camel/providers/local/camel-spool-summary.c:789
+#: camel/providers/local/camel-spool-summary.c:798
+#: camel/providers/local/camel-spool-summary.c:807
 #, fuzzy, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Negal�jau atidaryti laikinos pa�to bylos %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:817
+#: camel/providers/local/camel-spool-summary.c:822
 #, fuzzy, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Negal�jau u�daryti �altinio aplanko %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:847
-#: camel/providers/local/camel-spool-summary.c:865
-#: camel/providers/local/camel-spool-summary.c:877
+#: camel/providers/local/camel-spool-summary.c:852
+#: camel/providers/local/camel-spool-summary.c:870
+#: camel/providers/local/camel-spool-summary.c:882
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in `%s'"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:936
+#: camel/providers/local/camel-spool-summary.c:941
 #, fuzzy, c-format
 msgid "Could not file: %s: %s"
 msgstr "Nepavyko �kelti %s: %s"
@@ -6329,31 +6710,31 @@ msgstr "Parsiun�iama POP santrauka"
 msgid "Could not check POP server for new messages: %s"
 msgstr "Negal�jau patikrinti, ar POP serveryje yra nauj� lai�k�: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:235
+#: camel/providers/pop3/camel-pop3-folder.c:242
 msgid "Could not open folder: message listing was incomplete."
 msgstr "Negal�jau atidaryti aplanko: lai�k� s�ra�as buvo nepilnas."
 
-#: camel/providers/pop3/camel-pop3-folder.c:259
+#: camel/providers/pop3/camel-pop3-folder.c:266
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "I�kirpti pa�ym�tus lai�kus"
 
-#: camel/providers/pop3/camel-pop3-folder.c:335
+#: camel/providers/pop3/camel-pop3-folder.c:342
 #, c-format
 msgid "Could not fetch message: %s"
 msgstr "Negal�jau parsi�sti lai�ko: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:351
+#: camel/providers/pop3/camel-pop3-folder.c:358
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Negal�jau parsi�sti lai�ko i� POP serverio %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:374
+#: camel/providers/pop3/camel-pop3-folder.c:381
 #, c-format
 msgid "No message with uid %s"
 msgstr "N�ra lai�ko su uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:378
+#: camel/providers/pop3/camel-pop3-folder.c:385
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Parsiun�iamas POP lai�kas %d"
@@ -6371,7 +6752,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:51 mail/mail-config.glade.h:53
+#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:54
 msgid "POP"
 msgstr "POP"
 
@@ -6385,14 +6766,15 @@ msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
 msgstr ""
-"Su �ia parinktimi jungiantis prie POP serverio bus naudojamas paprasto teksto "
-"slapta�odis. Tai vienintel� parinktis, palaikoma daugelio POP serveri�."
+"Su �ia parinktimi jungiantis prie POP serverio bus naudojamas paprasto "
+"teksto slapta�odis. Tai vienintel� parinktis, palaikoma daugelio POP "
+"serveri�."
 
 #: camel/providers/pop3/camel-pop3-provider.c:80
 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 ""
 "Su �ia parinktimi jungiantis prie POP serverio bus naudojamas u��ifruotas "
 "slapta�odis per APOP protokol�. Tai gali veikti ne visiems vartotojams netgi "
@@ -6467,7 +6849,7 @@ msgid "Unexpected response from POP server: %s"
 msgstr "Netik�tas atsakymas i� IMAP serverio: %s"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:73
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -6520,14 +6902,15 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Pa�to siuntimas per sendmail program�"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:66
 msgid "SMTP"
 msgstr "SMTP"
 
 #: camel/providers/smtp/camel-smtp-provider.c:40
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
-"Pa�to siuntimui, prisijungiant prie nutolusio pa�to serverio naudojant SMTP.\n"
+"Pa�to siuntimui, prisijungiant prie nutolusio pa�to serverio naudojant "
+"SMTP.\n"
 
 #: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Syntax error, command unrecognized"
@@ -6673,7 +7056,7 @@ msgstr "Negaliu si�sti lai�ko: siunt�jo adresas neapibr��tas."
 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:595 mail/mail-ops.c:602
+#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:553
 msgid "Sending message"
 msgstr "Siun�iamas lai�kas"
 
@@ -6837,52 +7220,52 @@ msgstr "MIME tipas:"
 msgid "Suggest automatic display of attachment"
 msgstr "Pasi�lyti automatin� priedo parodym�"
 
-#: composer/e-msg-composer-hdrs.c:327
+#: composer/e-msg-composer-hdrs.c:326
 msgid "Click here for the address book"
 msgstr "Paspausk �ia, jei reikia adres� knygel�s"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:358
+#: composer/e-msg-composer-hdrs.c:357
 msgid "From:"
 msgstr "Nuo:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:363
 msgid "Reply-To:"
 msgstr "Atsakyti-kam:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:375
+#: composer/e-msg-composer-hdrs.c:374
 msgid "Subject:"
 msgstr "Tema:"
 
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:388
 msgid "To:"
 msgstr "Kam:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:389
 msgid "Enter the recipients of the message"
 msgstr "�vesk lai�ko gav�jus"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:392
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:393
 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:397
+#: composer/e-msg-composer-hdrs.c:396
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:397
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -6895,16 +7278,7 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Prisegti byl�"
 
-#: composer/e-msg-composer.c:670
-#, c-format
-msgid ""
-"Could not open file %s:\n"
-"%s"
-msgstr ""
-"Negal�jau atidaryti bylos %s:\n"
-"%s"
-
-#: composer/e-msg-composer.c:683
+#: composer/e-msg-composer.c:676
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -6913,29 +7287,29 @@ msgstr ""
 "Klaida skaitant byl� %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:865
+#: composer/e-msg-composer.c:858
 msgid "Save as..."
 msgstr "I�saugoti kaip..."
 
-#: composer/e-msg-composer.c:874
+#: composer/e-msg-composer.c:867
 msgid "Warning!"
 msgstr "�sp�jimas!"
 
-#: composer/e-msg-composer.c:878
+#: composer/e-msg-composer.c:871
 msgid "File exists, overwrite?"
 msgstr "Byla egzistuoja, u�ra�yti?"
 
-#: composer/e-msg-composer.c:900
+#: composer/e-msg-composer.c:893
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Klaida i�saugant byl�: %s"
 
-#: composer/e-msg-composer.c:919
+#: composer/e-msg-composer.c:912
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Klaida �keliant byl�: %s"
 
-#: composer/e-msg-composer.c:990
+#: composer/e-msg-composer.c:983
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -6943,16 +7317,16 @@ msgstr ""
 "Nepavyko atidaryti �ios s�skaitos juodra��i� aplanko.\n"
 "Ar nor�tum naudoti �prastin� juodra��i� aplank�?"
 
-#: composer/e-msg-composer.c:1043
+#: composer/e-msg-composer.c:1036
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Klaida prieinant prie bylos: %s"
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1044
 msgid "Unable to retrieve message from editor"
 msgstr "Nepavyko gauti lai�ko i� redaktoriaus"
 
-#: composer/e-msg-composer.c:1057
+#: composer/e-msg-composer.c:1050
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -6961,7 +7335,7 @@ msgstr ""
 "Negaliu sukurti i�vesties bylos: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1063
+#: composer/e-msg-composer.c:1056
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -6970,7 +7344,7 @@ msgstr ""
 "Negaliu sukurti i�vesties bylos: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1072
+#: composer/e-msg-composer.c:1065
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -6979,7 +7353,7 @@ msgstr ""
 "Klaida automati�kai i�saugant lai�k�: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1172
+#: composer/e-msg-composer.c:1165
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
@@ -6988,7 +7362,7 @@ msgstr ""
 "Evolution rado nei�saugot� byl� i� praeitos sesijos.\n"
 "Ar nor�tum pabandyti jas atkurti?"
 
-#: composer/e-msg-composer.c:1320
+#: composer/e-msg-composer.c:1313
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -6998,28 +7372,28 @@ msgstr ""
 "\n"
 "Ar nor�tum i�saugoti jo pakeitimus?"
 
-#: composer/e-msg-composer.c:1327
+#: composer/e-msg-composer.c:1320
 #, fuzzy
 msgid "Warning: Modified Message"
 msgstr "Persi�stas lai�kas"
 
-#: composer/e-msg-composer.c:1350
+#: composer/e-msg-composer.c:1343
 msgid "Open file"
 msgstr "Atidaryti byl�"
 
-#: composer/e-msg-composer.c:1499
+#: composer/e-msg-composer.c:1492
 msgid "Insert File"
 msgstr "�terpti byl�"
 
-#: composer/e-msg-composer.c:1875 composer/e-msg-composer.c:2316
+#: composer/e-msg-composer.c:1868 composer/e-msg-composer.c:2314
 msgid "Compose a message"
 msgstr "Sukurti lai�k�"
 
-#: composer/e-msg-composer.c:2406
+#: composer/e-msg-composer.c:2404
 msgid "Could not create composer window."
 msgstr "Negal�jau sukurti ra�ykl�s lango."
 
-#: composer/evolution-composer.c:359
+#: composer/evolution-composer.c:349
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
@@ -7027,11 +7401,11 @@ msgstr ""
 "Negal�jau sukurti ra�ykl�s lango, nes tu dar nenurodei\n"
 "jokios asmenyb�s pa�to komponente."
 
-#: composer/evolution-composer.c:374
+#: composer/evolution-composer.c:364
 msgid "Cannot initialize Evolution's composer."
 msgstr "Negal�jau inicializuoti Evolution ra�ykl�s."
 
-#: data/evolution.desktop.in.h:1
+#: data/evolution.desktop.in.h:1 shell/main.c:76
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -7079,83 +7453,100 @@ msgstr "Tema savyje turi"
 msgid "Subject does not contain"
 msgstr "Tema savyje neturi"
 
-#. strptime format for a date.
-#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:131
-#: e-util/e-time-utils.c:243
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1531
-msgid "%m/%d/%Y"
+#. strptime format of a weekday, a date and a time,
+#. in 12-hour format, without seconds.
+#: e-util/e-time-utils.c:168 e-util/e-time-utils.c:359
+msgid "%a %m/%d/%Y %I:%M %p"
+msgstr "%a %Y-%m-%d %H:%M"
+
+#. strptime format of a weekday, a date and a time,
+#. in 24-hour format, without seconds.
+#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:350
+msgid "%a %m/%d/%Y %H:%M"
+msgstr "%a %Y-%m-%d %H:%M"
+
+#. strptime format of a weekday, a date and a time,
+#. in 12-hour format, without minutes or seconds.
+#: e-util/e-time-utils.c:178
+#, fuzzy
+msgid "%a %m/%d/%Y %I %p"
+msgstr "%a %Y-%m-%d %H:%M"
+
+#. strptime format of a weekday, a date and a time,
+#. in 24-hour format, without minutes or seconds.
+#: e-util/e-time-utils.c:183
+#, fuzzy
+msgid "%a %m/%d/%Y %H"
+msgstr "%a %Y-%m-%d %H:%M"
+
+#. strptime format of a date and a time, in 12-hour format.
+#: e-util/e-time-utils.c:194
+#, fuzzy
+msgid "%m/%d/%Y %I:%M:%S %p"
+msgstr "%a %Y-%m-%d %I:%M:%S %p"
+
+#. strptime format of a date and a time, in 24-hour format.
+#: e-util/e-time-utils.c:198
+#, fuzzy
+msgid "%m/%d/%Y %H:%M:%S"
+msgstr "%a %Y-%m-%d %H:%M:%S"
+
+#. strptime format of a date and a time, in 12-hour format,
+#. without seconds.
+#: e-util/e-time-utils.c:203
+#, fuzzy
+msgid "%m/%d/%Y %I:%M %p"
+msgstr "%a %Y-%m-%d %H:%M"
+
+#. strptime format of a date and a time, in 24-hour format,
+#. without seconds.
+#: e-util/e-time-utils.c:208
+#, fuzzy
+msgid "%m/%d/%Y %H:%M"
+msgstr "%a %Y-%m-%d %H:%M"
+
+#. strptime format of a date and a time, in 12-hour format,
+#. without minutes or seconds.
+#: e-util/e-time-utils.c:213
+#, fuzzy
+msgid "%m/%d/%Y %I %p"
+msgstr "%a %Y-%m-%d %H:%M"
+
+#. strptime format of a date and a time, in 24-hour format,
+#. without minutes or seconds.
+#: e-util/e-time-utils.c:218
+#, fuzzy
+msgid "%m/%d/%Y %H"
 msgstr "%Y-%m-%d"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:277
-#: e-util/e-time-utils.c:368
+#: e-util/e-time-utils.c:300 e-util/e-time-utils.c:399
 msgid "%I:%M:%S %p"
 msgstr "%H:%M:%S"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:280
-#: e-util/e-time-utils.c:360
+#: e-util/e-time-utils.c:304 e-util/e-time-utils.c:391
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
-#. strptime format for time of day, without seconds, 12-hour format.
-#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:284
-#: e-util/e-time-utils.c:365 widgets/misc/e-dateedit.c:1339
-#: widgets/misc/e-dateedit.c:1566
+#. strptime format for time of day, without seconds,
+#. in 12-hour format.
+#: e-util/e-time-utils.c:309 e-util/e-time-utils.c:396
+#: widgets/misc/e-dateedit.c:1385 widgets/misc/e-dateedit.c:1612
 msgid "%I:%M %p"
 msgstr "%H:%M"
 
-#. strptime format for hour and AM/PM
-#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:287
-#, fuzzy
-msgid "%I %p"
-msgstr "%H:%M"
-
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:111 e-util/e-time-utils.c:290
-#: e-util/e-time-utils.c:357 widgets/misc/e-dateedit.c:1336
-#: widgets/misc/e-dateedit.c:1563
+#: e-util/e-time-utils.c:313 e-util/e-time-utils.c:388
+#: widgets/misc/e-dateedit.c:1382 widgets/misc/e-dateedit.c:1609
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#. This is the second-choice date format for the locale, which we use
-#. if previous attempts to parse the date string failed.
-#: e-util/e-time-utils.c:247
-msgid "%d/%m/%Y"
-msgstr "%Y-%m-%d"
-
-#. This is the third-choice date format for the locale, which we use
-#. if previous attempts to parse the date string failed.
-#: e-util/e-time-utils.c:251
-msgid "%Y/%m/%d"
-msgstr "%Y-%m-%d"
-
-#. This is the final-choice date format for the locale, which we use
-#. if previous attempts to parse the date string failed.
-#: e-util/e-time-utils.c:255
-#, c-format
-msgid "%x"
-msgstr "%x"
-
-#. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:314
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
-msgid "%a %m/%d/%Y"
-msgstr "%a %Y-%m-%d"
-
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:319
-msgid "%a %m/%d/%Y %H:%M"
-msgstr "%a %Y-%m-%d %H:%M"
-
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:328
-msgid "%a %m/%d/%Y %I:%M %p"
-msgstr "%a %Y-%m-%d %H:%M"
+#. strptime format for hour and AM/PM, 12-hour format.
+#: e-util/e-time-utils.c:317
+#, fuzzy
+msgid "%I %p"
+msgstr "%H:%M"
 
 #: filter/filter-datespec.c:80
 msgid "year"
@@ -7245,6 +7636,12 @@ msgstr "tavo nurodytas laikas"
 msgid "a time relative to the current time"
 msgstr "laikas, santykinis esamam laikui"
 
+#. The dialog
+#: filter/filter-datespec.c:394
+#, fuzzy
+msgid "Select a time to compare against"
+msgstr "Pasirink laiko juost�"
+
 #. The label
 #: filter/filter-datespec.c:428
 msgid "Compare against"
@@ -7275,11 +7672,11 @@ msgid "Filter Rules"
 msgstr "Filtravimo taisykl�s"
 
 #. and now for the action area
-#: filter/filter-filter.c:452
+#: filter/filter-filter.c:487
 msgid "Then"
 msgstr "Tada"
 
-#: filter/filter-filter.c:466
+#: filter/filter-filter.c:501
 msgid "Add action"
 msgstr "Prid�ti veiksm�"
 
@@ -7291,8 +7688,8 @@ msgstr ""
 "Vaje, tu pamir�ai pasirinkti aplank�.\n"
 "Pra�au, gr��k atgal ir nurodyk tikr� aplank�, � kur� perkelti lai�kus."
 
-#: filter/filter-folder.c:232 filter/vfolder-rule.c:319
-#: mail/mail-account-gui.c:820
+#: filter/filter-folder.c:232 filter/vfolder-rule.c:356
+#: mail/mail-account-gui.c:822
 msgid "Select Folder"
 msgstr "Pasirink aplank�"
 
@@ -7317,39 +7714,39 @@ msgstr ""
 msgid "Test"
 msgstr "Bandyti"
 
-#: filter/filter-rule.c:626
+#: filter/filter-rule.c:696
 msgid "Rule name: "
 msgstr "Taisykl�s pavadinimas:"
 
-#: filter/filter-rule.c:630
+#: filter/filter-rule.c:700
 msgid "Untitled"
 msgstr "Bevard�"
 
-#: filter/filter-rule.c:647
+#: filter/filter-rule.c:717
 msgid "If"
 msgstr "Jeigu"
 
-#: filter/filter-rule.c:665
+#: filter/filter-rule.c:735
 msgid "Execute actions"
 msgstr "�vykdyti veiksmus"
 
-#: filter/filter-rule.c:669
+#: filter/filter-rule.c:739
 msgid "if all criteria are met"
 msgstr "jei visos s�lygos tenkinamos"
 
-#: filter/filter-rule.c:674
+#: filter/filter-rule.c:744
 msgid "if any criteria are met"
 msgstr "jei kuri nors s�lyga tenkinama"
 
-#: filter/filter-rule.c:685
+#: filter/filter-rule.c:755
 msgid "Add criterion"
 msgstr "Prid�ti s�lyg�"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:840
 msgid "incoming"
 msgstr "gaunamas"
 
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:840
 msgid "outgoing"
 msgstr "siun�iamas"
 
@@ -7393,193 +7790,192 @@ msgstr "su visais vietiniais ir aktyviais nutolusiais aplankais"
 msgid "with all local folders"
 msgstr "su visais vietiniais aplankais"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
+#: filter/libfilter-i18n.h:3
 msgid "Assign Color"
 msgstr "Priskirti spalv�"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Priskirti �vert�"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
 msgid "Attachments"
 msgstr "Priedai"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "turi savyje"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopijuoti � aplank�"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Gavimo data"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Siuntimo data"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "I�trintas"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:13
+msgid "does not contain"
+msgstr "neturi savyje"
+
+#: filter/libfilter-i18n.h:14
+msgid "does not end with"
+msgstr "nesibaigia"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not exist"
+msgstr "neegzistuoja"
+
+#: filter/libfilter-i18n.h:16
+msgid "does not sound like"
+msgstr "neskamba pana�iai �"
+
+#: filter/libfilter-i18n.h:17
+msgid "does not start with"
+msgstr "neprasideda su"
+
+#: filter/libfilter-i18n.h:18
 msgid "Do Not Exist"
 msgstr "neegzistuoja"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:19
 msgid "Draft"
 msgstr "Juodra�tis"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:20
+msgid "ends with"
+msgstr "baigiasi su"
+
+#: filter/libfilter-i18n.h:21
 msgid "Exist"
 msgstr "Egzistuoja"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:22
+msgid "exists"
+msgstr "egzistuoja"
+
+#: filter/libfilter-i18n.h:23
 msgid "Expression"
 msgstr "I�rai�ka"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:24
 msgid "Important"
 msgstr "Svarbus"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:25
+msgid "is"
+msgstr "yra"
+
+#: filter/libfilter-i18n.h:26
+msgid "is greater than"
+msgstr "yra didesnis u�"
+
+#: filter/libfilter-i18n.h:27
+msgid "is less than"
+msgstr "yra ma�esnis u�"
+
+#: filter/libfilter-i18n.h:28
+msgid "is not"
+msgstr "n�ra"
+
+#: filter/libfilter-i18n.h:29
 msgid "Mailing list"
 msgstr "Konferencija"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr "Lai�ko tekstas"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:31
 msgid "Message Header"
 msgstr "Lai�ko antra�t�"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr "Lai�kas buvo gautas"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr "Lai�kas buvo i�si�stas"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "Perkelti � aplank�"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:35
+msgid "on or after"
+msgstr "tuo metu arba po"
+
+#: filter/libfilter-i18n.h:36
+msgid "on or before"
+msgstr "tuo metu ar prie�"
+
+#: filter/libfilter-i18n.h:37
 msgid "Read"
 msgstr "Skaitytas"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "Gav�jai"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr "Regex tenkina"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:40
 msgid "Replied to"
 msgstr "Atsakytas"
 
-#: filter/libfilter-i18n.h:25 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "�vertis"
 
-#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1109
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1251
 msgid "Sender"
 msgstr "Siunt�jas"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:43
 msgid "Set Status"
 msgstr "Priskirti b�sen�"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:44
 msgid "Size (kB)"
 msgstr "Dydis (kB)"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:45
+msgid "sounds like"
+msgstr "skamba pana�iai �"
+
+#: filter/libfilter-i18n.h:46
 msgid "Source Account"
 msgstr "�altinio s�skaita"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:47
 msgid "Specific header"
 msgstr "Savita antra�t�"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:48
+msgid "starts with"
+msgstr "prasideda su"
+
+#: filter/libfilter-i18n.h:50
 msgid "Stop Processing"
 msgstr "Sustabdyti vykdym�"
 
-#: filter/libfilter-i18n.h:33 mail/mail-format.c:889
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:917
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Tema"
 
-#: filter/libfilter-i18n.h:36
-msgid "contains"
-msgstr "turi savyje"
-
-#: filter/libfilter-i18n.h:37
-msgid "does not contain"
-msgstr "neturi savyje"
-
-#: filter/libfilter-i18n.h:38
-msgid "does not end with"
-msgstr "nesibaigia"
-
-#: filter/libfilter-i18n.h:39
-msgid "does not exist"
-msgstr "neegzistuoja"
-
-#: filter/libfilter-i18n.h:40
-msgid "does not sound like"
-msgstr "neskamba pana�iai �"
-
-#: filter/libfilter-i18n.h:41
-msgid "does not start with"
-msgstr "neprasideda su"
-
-#: filter/libfilter-i18n.h:42
-msgid "ends with"
-msgstr "baigiasi su"
-
-#: filter/libfilter-i18n.h:43
-msgid "exists"
-msgstr "egzistuoja"
-
-#: filter/libfilter-i18n.h:44
-msgid "is greater than"
-msgstr "yra didesnis u�"
-
-#: filter/libfilter-i18n.h:45
-msgid "is less than"
-msgstr "yra ma�esnis u�"
-
-#: filter/libfilter-i18n.h:46
-msgid "is not"
-msgstr "n�ra"
-
-#: filter/libfilter-i18n.h:47
-msgid "is"
-msgstr "yra"
-
-#: filter/libfilter-i18n.h:48
-msgid "on or after"
-msgstr "tuo metu arba po"
-
-#: filter/libfilter-i18n.h:49
-msgid "on or before"
-msgstr "tuo metu ar prie�"
-
-#: filter/libfilter-i18n.h:50
-msgid "sounds like"
-msgstr "skamba pana�iai �"
-
-#: filter/libfilter-i18n.h:51
-msgid "starts with"
-msgstr "prasideda su"
-
 #: filter/libfilter-i18n.h:52
 msgid "was after"
 msgstr "buvo po"
@@ -7596,7 +7992,7 @@ msgstr "Taisykl�s"
 msgid "Add Rule"
 msgstr "Prid�ti taisykl�"
 
-#: filter/rule-editor.c:299
+#: filter/rule-editor.c:301
 msgid "Edit Rule"
 msgstr "Keisti taisykl�"
 
@@ -7604,7 +8000,7 @@ msgstr "Keisti taisykl�"
 msgid "Score Rules"
 msgstr "�ver�io taisykl�s"
 
-#: filter/vfolder-rule.c:198
+#: filter/vfolder-rule.c:206
 msgid "Oops.  You need to to specify at least one folder as a source."
 msgstr ""
 
@@ -7614,33 +8010,33 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution komponentas pa�tui tvarkyti."
 
 #: importers/elm-importer.c:97 importers/netscape-importer.c:108
-#: importers/pine-importer.c:101
+#: importers/pine-importer.c:102
 #, fuzzy
 msgid "Importing..."
 msgstr "Importuojama"
 
 #: importers/elm-importer.c:99 importers/netscape-importer.c:110
-#: importers/pine-importer.c:103
+#: importers/pine-importer.c:104
 #, fuzzy
 msgid "Please wait"
 msgstr "baigiasi su"
 
-#: importers/elm-importer.c:171 importers/netscape-importer.c:687
-#: importers/pine-importer.c:438
+#: importers/elm-importer.c:171 importers/netscape-importer.c:708
+#: importers/pine-importer.c:369
 #, fuzzy, c-format
 msgid "Importing %s as %s"
 msgstr ""
 "Importuojama %s.\n"
 "Pradedama %s"
 
-#: importers/elm-importer.c:377 importers/netscape-importer.c:780
-#: importers/pine-importer.c:576
+#: importers/elm-importer.c:377 importers/netscape-importer.c:801
+#: importers/pine-importer.c:506
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "Siun�iamas �%s�"
 
-#: importers/elm-importer.c:528 importers/netscape-importer.c:953
-#: importers/pine-importer.c:739 mail/component-factory.c:95
+#: importers/elm-importer.c:528 importers/netscape-importer.c:974
+#: importers/pine-importer.c:669 mail/component-factory.c:96
 msgid "Mail"
 msgstr "Pa�tas"
 
@@ -7661,7 +8057,7 @@ msgstr "Elm"
 msgid "GnomeCard:"
 msgstr "Kortel�: "
 
-#: importers/evolution-gnomecard-importer.c:231 importers/pine-importer.c:744
+#: importers/evolution-gnomecard-importer.c:231 importers/pine-importer.c:674
 msgid "Addressbook"
 msgstr "Adres� knygel�"
 
@@ -7677,21 +8073,21 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importuoja tavo senus Netscape duomenis"
 
-#: importers/netscape-importer.c:883 importers/pine-importer.c:672
+#: importers/netscape-importer.c:904 importers/pine-importer.c:602
 #, fuzzy
 msgid "Scanning directory"
 msgstr "Skanuojamas IMAP aplankas"
 
-#: importers/netscape-importer.c:892
+#: importers/netscape-importer.c:913
 #, fuzzy
 msgid "Starting import"
 msgstr "_Prad�ios data:"
 
-#: importers/netscape-importer.c:958
+#: importers/netscape-importer.c:979
 msgid "Settings"
 msgstr "Nuostatos"
 
-#: importers/netscape-importer.c:979
+#: importers/netscape-importer.c:1000
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -7699,11 +8095,11 @@ msgstr ""
 "Evolution rado Netscape pa�to byl�.\n"
 "Ar nor�tum jas importuoti � Evolution?"
 
-#: importers/pine-importer.c:100
+#: importers/pine-importer.c:101
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution importuoja tavo senus Pine duomenis"
 
-#: importers/pine-importer.c:765
+#: importers/pine-importer.c:695
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -7711,7 +8107,7 @@ msgstr ""
 "Evolution rado Pine pa�to byl�.\n"
 "Ar nor�tum jas importuoti � Evolution?"
 
-#: importers/pine-importer.c:793
+#: importers/pine-importer.c:723
 #, fuzzy
 msgid "Pine"
 msgstr "Spausdinti"
@@ -7749,49 +8145,55 @@ msgstr "Pa�to ap�valgos komponento gamykla."
 msgid "Mail configuration interface"
 msgstr "Pa�to nustatymo s�saja"
 
-#: mail/component-factory.c:95
+#: mail/component-factory.c:96
 msgid "Folder containing mail"
 msgstr "Aplankas, kuriame yra lai�kai"
 
-#: mail/component-factory.c:96
+#: mail/component-factory.c:97
 msgid "Mail storage folder (internal)"
 msgstr ""
 
-#: mail/component-factory.c:97
+#: mail/component-factory.c:98
 #, fuzzy
 msgid "Virtual Trash"
 msgstr "Virtual�s aplankai"
 
-#: mail/component-factory.c:97
+#: mail/component-factory.c:98
 #, fuzzy
 msgid "Virtual Trash folder"
 msgstr "Virtual�s aplankai"
 
-#: mail/component-factory.c:113
+#: mail/component-factory.c:114
 msgid "This folder cannot contain messages."
 msgstr "�iame aplanke negali b�ti lai�k�."
 
-#: mail/component-factory.c:344
+#: mail/component-factory.c:356
 msgid "Properties..."
 msgstr "Savyb�s..."
 
-#: mail/component-factory.c:344
+#: mail/component-factory.c:356
 msgid "Change this folder's properties"
 msgstr "Pakeisti �io aplanko savybes"
 
-#: mail/component-factory.c:766
+#: mail/component-factory.c:698
+msgid ""
+"Some of your mail settings seem corrupt, please check that everything is in "
+"order."
+msgstr ""
+
+#: mail/component-factory.c:812
 msgid "New Mail Message"
 msgstr "Naujas pa�to lai�kas"
 
-#: mail/component-factory.c:766
+#: mail/component-factory.c:812
 msgid "New _Mail Message"
 msgstr "Naujas _pa�to lai�kas"
 
-#: mail/component-factory.c:797
+#: mail/component-factory.c:843
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Negaliu inicializuoti Evolution pa�to komponento."
 
-#: mail/component-factory.c:974
+#: mail/component-factory.c:1032
 msgid "Cannot register storage with shell"
 msgstr "Negaliu u�registruoti saugyklos apvalkale"
 
@@ -7804,129 +8206,159 @@ msgstr "�%s� savyb�s"
 msgid "Properties"
 msgstr "Savyb�s"
 
-#: mail/folder-browser.c:229 mail/mail-display.c:275
+#: mail/folder-browser.c:262 mail/mail-display.c:275
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Negal�jau sukurti laikino katalogo: %s"
 
-#: mail/folder-browser.c:905
+#: mail/folder-browser.c:734
+#, c-format
+msgid "%d new"
+msgstr "%d nauji"
+
+#: mail/folder-browser.c:737 mail/folder-browser.c:742
+#: mail/folder-browser.c:746
+msgid ", "
+msgstr ", "
+
+#: mail/folder-browser.c:738
+#, c-format
+msgid "%d hidden"
+msgstr "%d pasl�pti"
+
+#: mail/folder-browser.c:743
+#, c-format
+msgid "%d selected"
+msgstr "%d pa�ym�ti"
+
+#: mail/folder-browser.c:748
+#, c-format
+msgid "%d unsent"
+msgstr "%d nei�si�sti"
+
+#: mail/folder-browser.c:750
+#, c-format
+msgid "%d total"
+msgstr "%d i� viso"
+
+#: mail/folder-browser.c:993
 msgid "Create vFolder from Search"
 msgstr "Sukurti vAplank� i� paie�kos"
 
-#: mail/folder-browser.c:1250
+#: mail/folder-browser.c:1338
 msgid "VFolder on _Subject"
 msgstr "vAplankas pagal _Tem�"
 
-#: mail/folder-browser.c:1253
+#: mail/folder-browser.c:1341
 msgid "VFolder on Se_nder"
 msgstr "vAplankas pagal Siu_nt�j�"
 
-#: mail/folder-browser.c:1256
+#: mail/folder-browser.c:1344
 msgid "VFolder on _Recipients"
 msgstr "vAplankas pagal _Gav�jus"
 
-#: mail/folder-browser.c:1259
+#: mail/folder-browser.c:1347
 msgid "VFolder on Mailing _List"
 msgstr "vAplankas pagal _Konferencij�"
 
-#: mail/folder-browser.c:1265
+#: mail/folder-browser.c:1353
 msgid "Filter on Sub_ject"
 msgstr "Filtras pagal T_em�"
 
-#: mail/folder-browser.c:1268
+#: mail/folder-browser.c:1356
 msgid "Filter on Sen_der"
 msgstr "Filtras pagal Si_unt�j�"
 
-#: mail/folder-browser.c:1271
+#: mail/folder-browser.c:1359
 msgid "Filter on Re_cipients"
 msgstr "Filtras pagal Ga_v�jus"
 
-#: mail/folder-browser.c:1274
+#: mail/folder-browser.c:1362
 msgid "Filter on _Mailing List"
 msgstr "Filtras pagal K_onferencij�"
 
-#: mail/folder-browser.c:1285 ui/evolution-mail-message.xml.h:89
+#: mail/folder-browser.c:1373 ui/evolution-mail-message.xml.h:89
 msgid "_Edit as New Message..."
 msgstr "_Taisyti kaip nauj� lai�k�..."
 
-#: mail/folder-browser.c:1287 ui/evolution-mail-message.xml.h:97
+#: mail/folder-browser.c:1375 ui/evolution-mail-message.xml.h:97
 msgid "_Save As..."
 msgstr "I�_saugoti kaip..."
 
-#: mail/folder-browser.c:1289
+#: mail/folder-browser.c:1377
 msgid "_Print"
 msgstr "S_pausdinti"
 
-#: mail/folder-browser.c:1294 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1382 ui/evolution-mail-message.xml.h:96
 msgid "_Reply to Sender"
 msgstr "_Atsakyti siunt�jui"
 
-#: mail/folder-browser.c:1296 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1384 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _List"
 msgstr "Atsakyti � _konferencij�"
 
-#: mail/folder-browser.c:1298 ui/evolution-mail-message.xml.h:68
+#: mail/folder-browser.c:1386 ui/evolution-mail-message.xml.h:68
 msgid "Reply to _All"
 msgstr "Atsakyti _visiems"
 
-#: mail/folder-browser.c:1300
+#: mail/folder-browser.c:1388
 msgid "_Forward"
 msgstr "P_ersi�sti"
 
-#: mail/folder-browser.c:1303 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1391 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "Pa�ym�ti s_kaitytu"
 
-#: mail/folder-browser.c:1305 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1393 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Pa�ym�ti _neskaitytu"
 
-#: mail/folder-browser.c:1307
+#: mail/folder-browser.c:1395
 msgid "Mark as _Important"
 msgstr "Pa�ym�ti svarb_iu"
 
-#: mail/folder-browser.c:1309
+#: mail/folder-browser.c:1397
 msgid "Mark as Unim_portant"
 msgstr "Pa�ym�ti nesva_rbiu"
 
-#: mail/folder-browser.c:1314
+#: mail/folder-browser.c:1402
 msgid "_Move to Folder..."
 msgstr "Pe_rkelti � aplank�..."
 
-#: mail/folder-browser.c:1316
+#: mail/folder-browser.c:1404
 msgid "_Copy to Folder..."
 msgstr "K_opijuoti � aplank�..."
 
-#: mail/folder-browser.c:1320 ui/evolution-mail-message.xml.h:99
+#: mail/folder-browser.c:1408 ui/evolution-mail-message.xml.h:99
 msgid "_Undelete"
 msgstr "S_ugr��inti"
 
-#: mail/folder-browser.c:1325
+#: mail/folder-browser.c:1413
 msgid "Add Sender to Address Book"
 msgstr "Prid�ti siunt�j� � adres� knygel�"
 
-#: mail/folder-browser.c:1330
+#: mail/folder-browser.c:1418
 msgid "Apply Filters"
 msgstr "Pritaikyti filtrus"
 
-#: mail/folder-browser.c:1334
+#: mail/folder-browser.c:1422
 msgid "Create Ru_le From Message"
 msgstr "Sukurti _taisykl� i� lai�ko"
 
-#: mail/folder-browser.c:1492
+#: mail/folder-browser.c:1573
 msgid "Filter on Mailing List"
 msgstr "Filtras pagal Konferencij�"
 
-#: mail/folder-browser.c:1493
+#: mail/folder-browser.c:1574
 msgid "VFolder on Mailing List"
 msgstr "vAplankas pagal Konferencij�"
 
-#: mail/folder-browser.c:1495
+#: mail/folder-browser.c:1576
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtras pagal Konferencij� (%s)"
 
-#: mail/folder-browser.c:1496
+#: mail/folder-browser.c:1577
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "vAplankas pagal Konferencij� (%s)"
@@ -7999,11 +8431,18 @@ msgstr "Evolution naujien� tvarkykl�"
 msgid "Evolution Account Editor"
 msgstr "Evolution s�skait� tvarkykl�"
 
-#: mail/mail-account-gui.c:1010
+#: mail/mail-account-gui.c:947
+#, fuzzy
+msgid "Could not save signature file."
+msgstr ""
+"Negal�jau atidaryti para�o bylos %s: \n"
+"%s"
+
+#: mail/mail-account-gui.c:1024
 msgid "Save signature"
 msgstr "I�saugoti para��"
 
-#: mail/mail-account-gui.c:1016
+#: mail/mail-account-gui.c:1030
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -8013,40 +8452,40 @@ msgstr ""
 "\n"
 "Ar nor�tum i�saugoti pakeitimus?"
 
-#: mail/mail-account-gui.c:1597
+#: mail/mail-account-gui.c:1615
 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:145
+#: mail/mail-accounts.c:144
 msgid " (default)"
 msgstr " (�prasta)"
 
-#: mail/mail-accounts.c:190
+#: mail/mail-accounts.c:189
 msgid "Disable"
 msgstr "I�jungti"
 
-#: mail/mail-accounts.c:192
+#: mail/mail-accounts.c:191
 msgid "Enable"
 msgstr "�jungti"
 
-#: mail/mail-accounts.c:279
+#: mail/mail-accounts.c:278
 msgid "Are you sure you want to delete this account?"
 msgstr "Ar tu tikrai nori i�trinti �i� s�skait�?"
 
-#: mail/mail-accounts.c:283
+#: mail/mail-accounts.c:282
 msgid "Don't delete"
 msgstr "Nei�trinti"
 
-#: mail/mail-accounts.c:286
+#: mail/mail-accounts.c:285
 msgid "Really delete account?"
 msgstr "Ar tikrai i�trinti s�skait�?"
 
-#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
+#: mail/mail-accounts.c:511 mail/mail-accounts.c:515
 msgid "Are you sure you want to delete this news account?"
 msgstr "Ar tu tikrai nori i�trinti �i� naujien� s�skait�?"
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:758 mail/mail-config.glade.h:42
+#: mail/mail-accounts.c:760 mail/mail-config.glade.h:45
 msgid "Mail Settings"
 msgstr "Pa�to nuostatos"
 
@@ -8106,7 +8545,19 @@ msgstr ""
 msgid "You have not set a mail transport method"
 msgstr "Tu nenustatei pa�to siuntimo metodo"
 
-#: mail/mail-callbacks.c:218
+#. FIXME: this wording sucks
+#: mail/mail-callbacks.c:216
+msgid ""
+"You are sending an HTML-formatted message, but the following recipients do "
+"not want HTML-formatted mail:\n"
+msgstr ""
+
+#: mail/mail-callbacks.c:231
+#, fuzzy
+msgid "Send anyway?"
+msgstr "Pasi�sti lai�k�"
+
+#: mail/mail-callbacks.c:273
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -8114,19 +8565,19 @@ msgstr ""
 "�is lai�kas neturi temos.\n"
 "Tikrai si�sti?"
 
-#: mail/mail-callbacks.c:262
+#: mail/mail-callbacks.c:317
 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 ""
-"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."
+"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:266
+#: mail/mail-callbacks.c:321
 msgid "This message contains only Bcc recipients."
 msgstr "�iame lai�ke yra tik Bcc gav�jai."
 
-#: mail/mail-callbacks.c:270
+#: mail/mail-callbacks.c:325
 #, fuzzy
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -8134,37 +8585,42 @@ msgid ""
 "Send anyway?"
 msgstr "Gali b�ti, kad pa�to serveris"
 
-#: mail/mail-callbacks.c:359
+#: mail/mail-callbacks.c:419
+#, fuzzy
+msgid "This message contains invalid recipients:"
+msgstr "�iame lai�ke yra tik Bcc gav�jai."
+
+#: mail/mail-callbacks.c:454
 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:424
+#: mail/mail-callbacks.c:550
 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:666
+#: mail/mail-callbacks.c:783
 #, fuzzy
 msgid "an unknown sender"
 msgstr "Ne�inoma klaida"
 
-#: mail/mail-callbacks.c:671
+#: mail/mail-callbacks.c:788
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "%a, %Y-%m-%d %H:%M, %%s ra��:"
 
-#: mail/mail-callbacks.c:1029
+#: mail/mail-callbacks.c:1171
 msgid "Move message(s) to"
 msgstr "Perkelti lai�k�(us) �"
 
-#: mail/mail-callbacks.c:1031
+#: mail/mail-callbacks.c:1173
 msgid "Copy message(s) to"
 msgstr "Kopijuoti lai�k�(us) �"
 
-#: mail/mail-callbacks.c:1400
+#: mail/mail-callbacks.c:1547
 #, 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:1422
+#: mail/mail-callbacks.c:1569
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -8172,7 +8628,7 @@ msgstr ""
 "Tu gali taisyti tik lai�kus, esan�ius \n"
 "Juodra��i� aplanke."
 
-#: mail/mail-callbacks.c:1456
+#: mail/mail-callbacks.c:1603
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -8180,28 +8636,28 @@ msgstr ""
 "Tu gali i� naujo pasi�sti lai�kus\n"
 "tik i� Sent aplanko."
 
-#: mail/mail-callbacks.c:1468
+#: mail/mail-callbacks.c:1615
 #, 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:1489
+#: mail/mail-callbacks.c:1636
 msgid "No Message Selected"
 msgstr "Joks lai�kas nepa�ym�tas"
 
-#: mail/mail-callbacks.c:1574
+#: mail/mail-callbacks.c:1721
 msgid "Save Message As..."
 msgstr "I�saugoti lai�k� kaip..."
 
-#: mail/mail-callbacks.c:1576
+#: mail/mail-callbacks.c:1723
 msgid "Save Messages As..."
 msgstr "I�saugoti lai�kus kaip..."
 
-#: mail/mail-callbacks.c:1721 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:1868 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "�sp�jimas"
 
-#: mail/mail-callbacks.c:1726
+#: mail/mail-callbacks.c:1873
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8213,11 +8669,11 @@ msgstr ""
 "\n"
 "Tikrai i�trinti tuos lai�kus?"
 
-#: mail/mail-callbacks.c:1733
+#: mail/mail-callbacks.c:1880
 msgid "Do not ask me again."
 msgstr "Kit� kart� nebeklausti."
 
-#: mail/mail-callbacks.c:1838
+#: mail/mail-callbacks.c:1985
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -8226,27 +8682,27 @@ msgstr ""
 "Klaida, �keliant filtro informacij�:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1848
+#: mail/mail-callbacks.c:1995
 msgid "Filters"
 msgstr "Filtrai"
 
-#: mail/mail-callbacks.c:1894
+#: mail/mail-callbacks.c:2041
 msgid "Print Message"
 msgstr "Spausdinti lai�k�"
 
-#: mail/mail-callbacks.c:1940
+#: mail/mail-callbacks.c:2087
 msgid "Printing of message failed"
 msgstr "Nepavyko atspausdinti lai�ko"
 
-#: mail/mail-callbacks.c:2024
+#: mail/mail-callbacks.c:2171
 #, 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?"
 
 #: mail/mail-config-druid.c:135
 msgid ""
-"Please enter your name and email address below. The \"optional\" fields below "
-"do not need to be filled in,\n"
+"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."
 msgstr ""
 "Pra�au �vesti savo vard� ir elektroninio pa�to adres� �emiau. \"Neb�tini\" "
@@ -8282,8 +8738,9 @@ 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\nmake an Evolution mail account. Please enter a name for this account in "
-"the space below.\n"
+"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."
 msgstr ""
 "Tu jau beveik baigei konfig�ruoti savo pa�t�. Asmenyb�, gaunamo pa�to "
@@ -8296,82 +8753,108 @@ msgstr ""
 msgid "Evolution Account Assistant"
 msgstr "Evolution s�skait� pad�j�jas"
 
-#. right now, the URL always works basically as a matter of luck...
-#. * both IMAP and mbox spool stores have INBOX as their inbox folder
-#. * name. I don't think this will work with maildir. How can we figure out
-#. * what shortcut to insert?
+#: mail/mail-config.c:315
+#, fuzzy, c-format
+msgid "Account %d"
+msgstr "S�skaita"
+
+#: mail/mail-config.c:1618
+#, c-format
+msgid ""
+"Could not get inbox for new mail store:\n"
+"%s\n"
+"No shortcut will be created."
+msgstr ""
+
+#. Create the shortcut. FIXME: This only works if the
+#. * full name matches the path.
 #.
-#: mail/mail-config.c:1587
+#: mail/mail-config.c:1629
 #, c-format
 msgid "%s: Inbox"
 msgstr "%s: Gauti lai�kai"
 
-#: mail/mail-config.c:1829
+#: mail/mail-config.c:1873
 msgid "Checking Service"
 msgstr "Tikrinama paslauga"
 
-#: mail/mail-config.c:1900 mail/mail-config.c:1903
+#: mail/mail-config.c:1944 mail/mail-config.c:1947
 msgid "Connecting to server..."
 msgstr "Jungiamasi prie serverio..."
 
 #: mail/mail-config.glade.h:1
+#, fuzzy
+msgid " _Check for supported types "
+msgstr "_Patikrinti, kokie tipai palaikomi"
+
+#: mail/mail-config.glade.h:2
 msgid " color"
 msgstr " spalva"
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:3
 #, fuzzy
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "Nurodytas tipas �ioje saugykloje nepalaikomas"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 msgid "Account"
 msgstr "S�skaita"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "Account Information"
 msgstr "S�skaitos informacija"
 
-#: mail/mail-config.glade.h:5 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:6 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "S�skaitos tvarkymas"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "Accounts"
 msgstr "S�skaitos"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
 msgid "Always encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
 msgid "Always encrypt to myself when sending encrypyed mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:10
 msgid "Always sign outgoing messages when using this account"
 msgstr "Visada pasira�yti siun�iamus lai�kus, kai naudojama �i s�skaita"
 
-#: mail/mail-config.glade.h:10 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Priedas"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:12
 msgid "Authentication"
 msgstr "Autentikacija"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:13
 msgid "Authentication Type: "
 msgstr "Autentikacijos tipas: "
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:14
 msgid "Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:16
 msgid "Composer"
 msgstr "Ra�ykl�"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:17
+#, fuzzy
+msgid "Configuration"
+msgstr "Pa�to nustatymas"
+
+#: mail/mail-config.glade.h:18
+#, fuzzy
+msgid "Confirm when Expunging a folder"
+msgstr "I�valomas aplankas"
+
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -8386,237 +8869,226 @@ msgstr ""
 "\n"
 "Paspausk �Baigti�, kad i�saugotum nuostatas."
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:25
 msgid "De_fault"
 msgstr "�p_rastas"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:26
 msgid "Default Forward style is: "
 msgstr "�prastas persiuntimo b�das yra: "
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:27
 msgid "Default character encoding: "
 msgstr "�prasta koduot�: "
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:29
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:30
 msgid "Display"
 msgstr "Vaizdavimas"
 
-#: mail/mail-config.glade.h:27 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:31 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Baigta"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:32 shell/e-local-storage.c:174
 msgid "Drafts"
 msgstr "Juodra��iai"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:33
 msgid "Drafts folder:"
 msgstr "Juodra��i� aplankas:"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:34
 msgid "E_nable"
 msgstr "�ju_ngti"
 
-#: mail/mail-config.glade.h:31
-msgid "Each account must have a different name."
-msgstr "Visos s�skaitos privalo tur�ti skirtingus vardus."
-
-#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:96
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:96
 #: widgets/misc/e-filter-bar.h:103
 msgid "Edit..."
 msgstr "Taisyti..."
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:36
 msgid "Enabled"
 msgstr "�jungta"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:37
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:38
 msgid "HTML signature file:"
 msgstr "HTML para�o byla:"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:39
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:40 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Asmenyb�"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:41
 msgid "In HTML mail"
 msgstr "HTML lai�kuose"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:42
 msgid "Inline"
 msgstr "Viduje"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:43
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:44
 msgid "Mail Configuration"
 msgstr "Pa�to nustatymas"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:46
 msgid "Mailbox location"
 msgstr "Pa�to d��ut�s vieta"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:47
 msgid "Make this my _default account"
 msgstr "Pa_daryti �i� s�skait� �prastine"
 
-#: mail/mail-config.glade.h:45
-msgid "Message _preview should be displayed by default"
-msgstr "Lai�ko _per�i�ros sritis turi b�ti rodoma �prastai"
-
-#: mail/mail-config.glade.h:46
-msgid "Message list should display in a _threaded fashion by default"
-msgstr "Lai�k� s�ra�as �prastai turi b�ti rodomas suskirstytas _gijomis"
-
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 msgid "NNTP Server:"
 msgstr "NNTP serveris:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:49
 msgid "News"
 msgstr "Naujienos"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:51
 msgid "Optional Information"
 msgstr "Neb�tina informacija"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:53
 msgid "PGP Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 msgid "Pick a color"
 msgstr "Pasirink spalv�"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 msgid "Pretty Good Privacy"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 msgid "Prompt when sending messages with an _empty subject"
 msgstr "Paklausti prie� siun�iant lai�kus su _tu��ia tema"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 msgid "Prompt 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:59
+#: mail/mail-config.glade.h:60
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:61
 msgid "Quoted"
 msgstr "Cituojant"
 
-#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Pa�to gavimas"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:63
 msgid "Receiving Mail"
 msgstr "Pa�to gavimas"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:64
 msgid "Receiving Options"
 msgstr "Gavimo nuostatos"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:65
 msgid "Required Information"
 msgstr "B�tina informacija"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:67
 msgid "Secure MIME"
 msgstr ""
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:68
 msgid "Security"
 msgstr "Saugumas"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:69
 msgid "Select Filter Log file..."
 msgstr "Pasirink Filtro log'o byl�..."
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Select PGP binary"
 msgstr "Pasirink PGP"
 
-#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:71 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Pa�to siuntimas"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:72
 msgid "Sending Mail"
 msgstr "Pa�to siuntimas"
 
-#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
+#: mail/mail-config.glade.h:74 mail/message-list.etspec.h:6
+#: shell/e-local-storage.c:177
 msgid "Sent"
 msgstr "Si�sti lai�kai"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:75
 msgid "Sent and Draft Messages"
 msgstr "I�si�sti lai�kai ir juodra��iai"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:76
 msgid "Sent messages folder:"
 msgstr "I�si�st� lai�k� aplankas:"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:77
 msgid "Server Configuration"
 msgstr "Serverio nustatymas"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:78
 msgid "Server Type: "
 msgstr "Serverio tipas:"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 msgid "Server requires _authentication"
 msgstr "Serveris reikalauja _autentikacijos"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:80
 msgid "Signature file:"
 msgstr "Para�o byla:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "Source"
 msgstr "�altinis"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 msgid "Source Information"
 msgstr "�altinio informacija"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:83
 msgid "Sources"
 msgstr "�altiniai"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
 msgid "Special Folders"
 msgstr "Ypatingi aplankai"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:85
 msgid "Standard Unix mbox"
 msgstr "Standartin� Unix mbox"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:87
 msgid "Use secure connection (_SSL)"
 msgstr "Naudoti saugi� jungt� (_SSL)"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:88
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -8626,79 +9098,75 @@ msgstr ""
 "\n"
 "Spausk �Tolyn�, kad prad�tum."
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:92
 msgid "_Always load images off the net"
 msgstr "Vis_ada �kelti paveiksl�lius i� tinklo"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:93
 msgid "_Automatically check for new mail every"
 msgstr "_Automati�kai tikrinti pa�t� kas"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:94
 msgid "_Check for supported types"
 msgstr "_Patikrinti, kokie tipai palaikomi"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:97
 msgid "_Email Address:"
 msgstr "_El. pa�to adresas:"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:98
 msgid "_Empty trash folders on exit"
 msgstr "_I�tu�tinti �iuk�li� aplankus i�einant"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 msgid "_Full Name:"
 msgstr "_Pilnas vardas:"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "_HTML Signature:"
 msgstr "_HTML para�as:"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 msgid "_Highlight citations with"
 msgstr "_Pary�kinti citatas su"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:102
 msgid "_Host:"
 msgstr "_Hostas:"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 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:103
+#: mail/mail-config.glade.h:104
 msgid "_Log filter actions to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 msgid "_Mark messages as Read after"
 msgstr "_Pa�ym�ti lai�kus skaitytais po"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "_Name:"
 msgstr "_Vardas:"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 msgid "_Never load images off the net"
 msgstr "_Niekada ne�kelti paveiksl�li� i� tinklo"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 msgid "_Organization:"
 msgstr "_Organizacija:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:109
 #, fuzzy
 msgid "_PGP binary path:"
 msgstr "PGP u��ifruoti"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 msgid "_Path:"
 msgstr "_Kelias:"
 
-#: mail/mail-config.glade.h:110
-msgid "_Remember PGP Passphrase until exit"
-msgstr "P_risiminti PGP slapta�od� iki i��jimo"
-
 #: mail/mail-config.glade.h:111
 msgid "_Remember this password"
 msgstr "_Prisiminti �� slapta�od�"
@@ -8731,46 +9199,46 @@ msgstr "placeholder"
 msgid "seconds."
 msgstr "sekund�i�."
 
-#: mail/mail-crypto.c:60
+#: mail/mail-crypto.c:59
 #, fuzzy
 msgid "Could not create a PGP signature context."
 msgstr "Negal�jau prisijungti prie POP serverio %s."
 
-#: mail/mail-crypto.c:86
+#: mail/mail-crypto.c:84
 #, fuzzy
 msgid "Could not create a PGP verification context."
 msgstr "Negal�jau prisijungti prie POP serverio %s."
 
-#: mail/mail-crypto.c:116
+#: mail/mail-crypto.c:113
 #, fuzzy
 msgid "Could not create a PGP encryption context."
 msgstr "Negal�jau sukurti ra�ykl�s lango."
 
-#: mail/mail-crypto.c:142
+#: mail/mail-crypto.c:138
 #, fuzzy
 msgid "Could not create a PGP decryption context."
 msgstr ""
 "Negal�jau sukurti katalogo %s:\n"
 "%s"
 
-#: mail/mail-crypto.c:177
+#: mail/mail-crypto.c:173
 msgid "Could not create a S/MIME signature context."
 msgstr ""
 
-#: mail/mail-crypto.c:209
+#: mail/mail-crypto.c:205
 msgid "Could not create a S/MIME certsonly context."
 msgstr ""
 
-#: mail/mail-crypto.c:240
+#: mail/mail-crypto.c:236
 msgid "Could not create a S/MIME encryption context."
 msgstr ""
 
-#: mail/mail-crypto.c:271
+#: mail/mail-crypto.c:267
 #, fuzzy
 msgid "Could not create a S/MIME envelope context."
 msgstr "Negal�jau sukurti ra�ykl�s lango."
 
-#: mail/mail-crypto.c:301
+#: mail/mail-crypto.c:297
 #, fuzzy
 msgid "Could not create a S/MIME decode context."
 msgstr "Negal�jau sukurti ra�ykl�s lango."
@@ -8809,169 +9277,150 @@ msgstr "I�orin� �i�rykl�"
 msgid "Loading message content"
 msgstr "�keliamas lai�ko turinys"
 
-#: mail/mail-display.c:1512
+#: mail/mail-display.c:1515
 msgid "Open Link in Browser"
 msgstr "Nuorod� atidaryti nar�ykl�je"
 
-#: mail/mail-display.c:1514
+#: mail/mail-display.c:1517
 msgid "Copy Link Location"
 msgstr "Kopijuoti nuorodos adres�"
 
-#: mail/mail-display.c:1516
+#: mail/mail-display.c:1520
 msgid "Save Link as (FIXME)"
 msgstr "I�saugoti nuorod� kaip (FIXME)"
 
-#: mail/mail-display.c:1518
+#: mail/mail-display.c:1523
 msgid "Save Image as..."
 msgstr "I�saugoti paveiksl�l� kaip..."
 
-#: mail/mail-folder-cache.c:151
-#, c-format
-msgid "%d new"
-msgstr "%d nauji"
-
-#: mail/mail-folder-cache.c:157 mail/mail-folder-cache.c:164
-#: mail/mail-folder-cache.c:171
-msgid ", "
-msgstr ", "
-
-#: mail/mail-folder-cache.c:158
-#, c-format
-msgid "%d hidden"
-msgstr "%d pasl�pti"
-
-#: mail/mail-folder-cache.c:165
-#, c-format
-msgid "%d selected"
-msgstr "%d pa�ym�ti"
-
-#: mail/mail-folder-cache.c:174
-#, c-format
-msgid "%d unsent"
-msgstr "%d nei�si�sti"
-
-#: mail/mail-folder-cache.c:176
-#, c-format
-msgid "%d total"
-msgstr "%d i� viso"
-
-#: mail/mail-format.c:623
+#: mail/mail-format.c:627
 #, c-format
 msgid "%s attachment"
 msgstr "%s priedas"
 
-#: mail/mail-format.c:676
+#: mail/mail-format.c:680
 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/mail-format.c:764
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:856
+#: mail/mail-format.c:862
 msgid "Bad Address"
 msgstr "Blogas adresas"
 
-#: mail/mail-format.c:878 mail/message-list.etspec.h:3
+#: mail/mail-format.c:903 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "Nuo"
 
-#: mail/mail-format.c:881
+#: mail/mail-format.c:906
 msgid "Reply-To"
 msgstr "Atsakyti-kam"
 
-#: mail/mail-format.c:884 mail/message-list.etspec.h:10
+#: mail/mail-format.c:910 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "Kam"
 
-#: mail/mail-format.c:887
+#: mail/mail-format.c:914
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:1307
+#: mail/mail-format.c:1357
 msgid "No GPG/PGP program configured."
 msgstr "Jokia PGP/GPG programa nesukonfig�ruota."
 
-#: mail/mail-format.c:1323
+#: mail/mail-format.c:1373
 msgid "Encrypted message not displayed"
 msgstr "U��ifruotas lai�kas neparodytas"
 
-#: mail/mail-format.c:1334
+#: mail/mail-format.c:1384
 msgid "Encrypted message"
 msgstr "U��ifruotas lai�kas"
 
-#: mail/mail-format.c:1335
+#: mail/mail-format.c:1385
 msgid "Click icon to decrypt."
 msgstr "Paspausk ant ikonos, kad i��ifruotum."
 
-#: mail/mail-format.c:1390
+#: mail/mail-format.c:1440
 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:1401
-msgid ""
-"This message is digitally signed but can not be proven to be authentic."
+#: mail/mail-format.c:1451
+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"
+"�is lai�kas yra pasira�ytas skaitmeniniu para�u, bet neina patikrinti, ar "
+"jis autenti�kas"
 
-#: mail/mail-format.c:2076
+#: mail/mail-format.c:2128
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Rodykl� � FTP svetain� (%s)"
 
-#: mail/mail-format.c:2090
+#: mail/mail-format.c:2142
 #, 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:2095
+#: mail/mail-format.c:2147
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Rodykl� � vietin� byl� (%s)"
 
-#: mail/mail-format.c:2124
+#: mail/mail-format.c:2176
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Rodykl� � nutolusius duomenis (%s)"
 
-#: mail/mail-format.c:2132
+#: mail/mail-format.c:2184
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Rodykl� � ne�inomus i�orinius duomenis (�%s� tipo)"
 
-#: mail/mail-format.c:2137
+#: mail/mail-format.c:2189
 #, fuzzy
 msgid "Malformed external-body part."
 msgstr "Blogai suformuota i�orinio k�no dalis."
 
-#: mail/mail-local.c:330
-#, c-format
-msgid "No such folder /%s"
-msgstr "N�ra tokio aplanko /%s"
+#: mail/mail-local.c:563
+#, fuzzy
+msgid "Reconfiguring folder"
+msgstr "Atnaujinamas aplankas"
 
-#: mail/mail-local.c:460
-#, c-format
-msgid "Registering '%s'"
-msgstr "Registruojamas '%s'"
+#: mail/mail-local.c:636
+#, fuzzy, c-format
+msgid ""
+"Cannot save folder metainfo; you'll probably 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:747
+#: mail/mail-local.c:689
+#, fuzzy, c-format
+msgid "Cannot save folder metainfo to %s: %s"
+msgstr "Negaliu sukurti aplanko u�rakto ant %s: %s"
+
+#: mail/mail-local.c:735
+#, fuzzy, c-format
+msgid "Cannot delete folder metadata %s: %s"
+msgstr ""
+"Negal�jau i�trinti aplanko:\n"
+"%s"
+
+#: mail/mail-local.c:1075
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Kei�iamas aplanko �%s� formatas � �%s�"
 
-#: mail/mail-local.c:868
+#: mail/mail-local.c:1090
 #, c-format
-msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
-"open this folder anymore: %s"
+msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
-"Negaliu i�saugoti metainfo. Tikriausiai tau daugiau\n"
-"nebepavyks atidaryti �io aplanko: %s"
 
-#: mail/mail-local.c:908
+#: mail/mail-local.c:1112
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -8979,16 +9428,16 @@ msgstr ""
 "Jei tu nebegali daugiau atidaryti �ios pa�to\n"
 "d��ut�s, tau teks sutaisyti j� rankut�mis."
 
-#: mail/mail-local.c:1001
+#: mail/mail-local.c:1200
 msgid "You cannot change the format of a non-local folder."
 msgstr "Tu negali pakeisti nevietinio aplanko formato."
 
-#: mail/mail-local.c:1012
-#, c-format
-msgid "Reconfigure %s"
+#: mail/mail-local.c:1209
+#, fuzzy, c-format
+msgid "Reconfigure /%s"
 msgstr "V�l konfig�ruoti %s"
 
-#: mail/mail-mt.c:187
+#: mail/mail-mt.c:199
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -8997,7 +9446,7 @@ msgstr ""
 "Klaida �%s� metu:\n"
 "%s"
 
-#: mail/mail-mt.c:190
+#: mail/mail-mt.c:202
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -9007,121 +9456,139 @@ msgstr ""
 "%s"
 
 #. Remember the password?
-#: mail/mail-mt.c:439
+#: mail/mail-mt.c:509
 msgid "Remember this password"
 msgstr "Prisiminti �� slapta�od�"
 
-#: mail/mail-mt.c:796
+#: mail/mail-mt.c:510
+msgid "Remember this password for the remainder of this session"
+msgstr ""
+
+#: mail/mail-mt.c:567
+#, fuzzy, c-format
+msgid "Enter Password for %s"
+msgstr "�vesk %s slapta�od�"
+
+#: mail/mail-mt.c:570
+#, fuzzy
+msgid "Enter Password"
+msgstr "�vesk %s slapta�od�"
+
+#: mail/mail-mt.c:886
 msgid "Working"
 msgstr "Dirbama"
 
-#: mail/mail-ops.c:85
+#: mail/mail-ops.c:86
 msgid "Filtering Folder"
 msgstr "Filtruojamas aplankas"
 
-#: mail/mail-ops.c:228
+#: mail/mail-ops.c:229
 msgid "Fetching Mail"
 msgstr "Gaunamas pa�tas"
 
-#: mail/mail-ops.c:598
+#: mail/mail-ops.c:482 mail/mail-ops.c:512
+msgid "However, the message was successfully sent."
+msgstr ""
+
+#: mail/mail-ops.c:549
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Siun�iamas �%s�"
 
-#: mail/mail-ops.c:717
+#: mail/mail-ops.c:668
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Siun�iamas lai�kas %d i� %d"
 
-#: mail/mail-ops.c:736
+#: mail/mail-ops.c:687
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Nes�km� ties lai�ku %d i� %d"
 
-#: mail/mail-ops.c:738 mail/mail-send-recv.c:500
+#: mail/mail-ops.c:689 mail/mail-send-recv.c:522
 msgid "Complete."
 msgstr "U�baigta."
 
-#: mail/mail-ops.c:831
+#: mail/mail-ops.c:782
 msgid "Saving message to folder"
 msgstr "Lai�kas i�saugomas � aplank�"
 
-#: mail/mail-ops.c:910
+#: mail/mail-ops.c:861
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Lai�kai perkeliami � %s"
 
-#: mail/mail-ops.c:910
+#: mail/mail-ops.c:861
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Lai�kai kopijuojami � %s"
 
-#: mail/mail-ops.c:927
+#: mail/mail-ops.c:878
 msgid "Moving"
 msgstr "Perkeliama"
 
-#: mail/mail-ops.c:930
+#: mail/mail-ops.c:881
 msgid "Copying"
 msgstr "Kopijuojama"
 
-#: mail/mail-ops.c:1042
+#: mail/mail-ops.c:993
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanuojami aplankas, esantys �%s�"
 
-#: mail/mail-ops.c:1219
+#. Fill in the new fields
+#: mail/mail-ops.c:1040 shell/e-local-storage.c:179
+msgid "Trash"
+msgstr "�iuk�l�s"
+
+#: mail/mail-ops.c:1173
 msgid "Forwarded messages"
 msgstr "Persi�sti lai�kai"
 
-#: mail/mail-ops.c:1261
+#: mail/mail-ops.c:1215
 #, c-format
 msgid "Opening folder %s"
 msgstr "Atidaromas aplankas %s"
 
-#: mail/mail-ops.c:1330
+#: mail/mail-ops.c:1284
 #, c-format
 msgid "Opening store %s"
 msgstr "Atidaroma saugykla %s"
 
-#: mail/mail-ops.c:1403
-#, c-format
-msgid "Creating folder %s"
-msgstr "Kuriamas aplankas %s"
-
-#: mail/mail-ops.c:1473
+#: mail/mail-ops.c:1353
 #, c-format
 msgid "Removing folder %s"
 msgstr "Trinamas aplankas %s"
 
-#: mail/mail-ops.c:1569
+#: mail/mail-ops.c:1445
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "Kuriamas aplankas %s"
 
-#: mail/mail-ops.c:1620
+#: mail/mail-ops.c:1496
 msgid "Refreshing folder"
 msgstr "Atnaujinamas aplankas"
 
-#: mail/mail-ops.c:1656
+#: mail/mail-ops.c:1532
 msgid "Expunging folder"
 msgstr "I�valomas aplankas"
 
-#: mail/mail-ops.c:1705
+#: mail/mail-ops.c:1581
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Gaunamas lai�kas %s"
 
-#: mail/mail-ops.c:1772
+#: mail/mail-ops.c:1648
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Gaunami %d lai�kai"
 
-#: mail/mail-ops.c:1858
+#: mail/mail-ops.c:1734
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "I�saugomi %d lai�kai"
 
-#: mail/mail-ops.c:1938
+#: mail/mail-ops.c:1846
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -9130,7 +9597,7 @@ msgstr ""
 "Negaliu sukurti i�vesties bylos: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1964
+#: mail/mail-ops.c:1874
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -9139,11 +9606,11 @@ msgstr ""
 "Klaida i�saugant lai�kus �: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2038
+#: mail/mail-ops.c:1948
 msgid "Saving attachment"
 msgstr "I�saugomas priedas"
 
-#: mail/mail-ops.c:2054
+#: mail/mail-ops.c:1964
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -9152,16 +9619,21 @@ msgstr ""
 "Negaliu sukurti i�vesties bylos: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2085
+#: mail/mail-ops.c:1995
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Negal�jau �ra�yti duomen�: %s"
 
-#: mail/mail-ops.c:2154
+#: mail/mail-ops.c:2064
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Atsijungiama nuo %s"
 
+#: mail/mail-ops.c:2065
+#, fuzzy, c-format
+msgid "Reconnecting to %s"
+msgstr "Atsijungiama nuo %s"
+
 #: mail/mail-search-dialogue.c:113
 msgid "_Search"
 msgstr "_Ie�koti"
@@ -9198,50 +9670,93 @@ msgstr "Rasti:"
 msgid "Matches:"
 msgstr "Tinka:"
 
-#: mail/mail-send-recv.c:138
+#: mail/mail-send-recv.c:139
 msgid "Cancelling..."
 msgstr "Nutraukiama..."
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:243
+#, fuzzy, c-format
+msgid "Server: %s, Type: %s"
+msgstr "Serverio tipas:"
+
+#: mail/mail-send-recv.c:245
+#, c-format
+msgid "Path: %s, Type: %s"
+msgstr ""
+
+#: mail/mail-send-recv.c:247
+#, fuzzy, c-format
+msgid "Type: %s"
+msgstr "Tipas:"
+
+#: mail/mail-send-recv.c:283
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "Siun�iamas ir gaunamas pa�tas"
 
-#: mail/mail-send-recv.c:312
+#: mail/mail-send-recv.c:284
+#, fuzzy
+msgid "Cancel All"
+msgstr "Nutraukti"
+
+#: mail/mail-send-recv.c:333
 msgid "Updating..."
 msgstr "Atnaujinama..."
 
-#: mail/mail-send-recv.c:313 mail/mail-send-recv.c:366
+#: mail/mail-send-recv.c:334 mail/mail-send-recv.c:387
 msgid "Waiting..."
 msgstr "Laukiama..."
 
-#: mail/mail-send-recv.c:496
+#: mail/mail-send-recv.c:518
 msgid "Cancelled."
 msgstr "Nutraukta."
 
-#: mail/mail-session.c:182
+#: mail/mail-session.c:183
 msgid "User canceled operation."
 msgstr "Vartotojas nutrauk� veiksm�."
 
-#: mail/mail-tools.c:173
+#: mail/mail-tools.c:133
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Negal�jau sukurti laikinos mbox �%s�: %s"
 
-#: mail/mail-tools.c:290
+#: mail/mail-tools.c:259
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Persi�stas lai�kas - %s"
 
-#: mail/mail-tools.c:294
+#: mail/mail-tools.c:263
 msgid "Forwarded message"
 msgstr "Persi�stas lai�kas"
 
-#: mail/mail-tools.c:442
+#: mail/mail-tools.c:396
 msgid "Forwarded Message"
 msgstr "Persi�stas lai�kas"
 
-#: mail/mail-vfolder.c:500
+#: mail/mail-vfolder.c:84
+#, fuzzy, c-format
+msgid "Setting up vfolder: %s"
+msgstr "Kuriamas aplankas %s"
+
+#: mail/mail-vfolder.c:201
+#, fuzzy, c-format
+msgid "Updating vfolders for uri: %s"
+msgstr "Skanuojami aplankas, esantys �%s�"
+
+#: mail/mail-vfolder.c:414
+#, c-format
+msgid ""
+"The following vFolder(s):\n"
+"%sUsed the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+msgstr ""
+
+#: mail/mail-vfolder.c:636
+msgid "VFolders"
+msgstr "vAplankai"
+
+#: mail/mail-vfolder.c:742
 msgid "New VFolder"
 msgstr "Naujas vAplankas"
 
@@ -9310,7 +9825,7 @@ msgstr "%a %H:%M"
 msgid "%b %d %Y"
 msgstr "%Y %b %d"
 
-#: mail/message-list.c:2316
+#: mail/message-list.c:2334
 msgid "Generating message list"
 msgstr "Generuojamas lai�k� s�ra�as"
 
@@ -9326,36 +9841,36 @@ msgstr "Gautas"
 msgid "Size"
 msgstr "Dydis"
 
-#: mail/subscribe-dialog.c:174
+#: mail/subscribe-dialog.c:219
 #, fuzzy, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Skanuojami aplankas, esantys �%s�"
 
-#: mail/subscribe-dialog.c:176
+#: mail/subscribe-dialog.c:221
 #, fuzzy, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Skanuojami aplankas, esantys �%s�"
 
-#: mail/subscribe-dialog.c:275
+#: mail/subscribe-dialog.c:320
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "U�sakomas aplankas �%s�"
 
-#: mail/subscribe-dialog.c:277
+#: mail/subscribe-dialog.c:322
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Atsisakoma aplanko �%s�"
 
-#: mail/subscribe-dialog.c:1248 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1280 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Aplankas"
 
-#: mail/subscribe-dialog.c:1490
+#: mail/subscribe-dialog.c:1521
 msgid "No server has been selected"
 msgstr "Joks serveris nepasirinktas"
 
-#: mail/subscribe-dialog.c:1547
+#: mail/subscribe-dialog.c:1582
 msgid "Please select a server."
 msgstr "Pra�om pasirinkti server�."
 
@@ -9395,34 +9910,34 @@ msgstr "_Atsisakyti"
 msgid "Evolution component for the executive summary."
 msgstr ""
 
-#: my-evolution/component-factory.c:30
+#: my-evolution/component-factory.c:45
 msgid "Folder containing the Evolution Summary"
 msgstr "Aplankas, kuriame yra Evolution ap�valga"
 
-#: my-evolution/component-factory.c:141
+#: my-evolution/component-factory.c:154
 #, fuzzy
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr "Negaliu inicializuoti Evolution pa�to komponento."
 
-#: my-evolution/e-summary-calendar.c:188 my-evolution/e-summary-calendar.c:206
+#: my-evolution/e-summary-calendar.c:263 my-evolution/e-summary-calendar.c:281
 msgid "Appointments"
 msgstr "�vykiai"
 
-#: my-evolution/e-summary-calendar.c:189
+#: my-evolution/e-summary-calendar.c:264
 msgid "No appointments"
 msgstr "N�ra �vyki�"
 
-#: my-evolution/e-summary-calendar.c:238
+#: my-evolution/e-summary-calendar.c:301
 #, fuzzy
 msgid "%k%M %d %B"
 msgstr "%A, %B %e"
 
-#: my-evolution/e-summary-calendar.c:240
+#: my-evolution/e-summary-calendar.c:303
 #, fuzzy
 msgid "%l:%M %d %B"
 msgstr "%A, %B %e"
 
-#: my-evolution/e-summary-mail.c:113
+#: my-evolution/e-summary-mail.c:130
 msgid "Mail summary"
 msgstr "Pa�to ap�valga"
 
@@ -9430,80 +9945,83 @@ msgstr "Pa�to ap�valga"
 #. see in My Evolution by default. You can find the list of all
 #. stations and their codes in Evolution sources
 #. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-preferences.c:65
-#: my-evolution/e-summary-weather.c:603
+#: my-evolution/e-summary-preferences.c:80
+#: my-evolution/e-summary-weather.c:630
 msgid "KBOS:ZSAM:EGAA"
 msgstr "EVRA:EETN"
 
-#: my-evolution/e-summary-preferences.c:427
+#: my-evolution/e-summary-preferences.c:441
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Dienos �odis"
 
-#: my-evolution/e-summary-preferences.c:448
+#: my-evolution/e-summary-preferences.c:463
 msgid "Quotes of the Day"
 msgstr "Dienos citatos"
 
-#: my-evolution/e-summary-preferences.c:876
+#: my-evolution/e-summary-preferences.c:929
 msgid "Add a news feed"
 msgstr "Prid�ti naujien� �altin�"
 
-#: my-evolution/e-summary-preferences.c:884
+#: my-evolution/e-summary-preferences.c:937
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "�vesk URL naujien� �altinio, kur� nori prid�ti"
 
-#: my-evolution/e-summary-preferences.c:888
+#: my-evolution/e-summary-preferences.c:941
 msgid "Name:"
 msgstr "Vardas:"
 
-#: my-evolution/e-summary-preferences.c:1423
+#: my-evolution/e-summary-preferences.c:1486
 msgid "Summary Settings"
 msgstr "Santraukos nuostatos"
 
-#: my-evolution/e-summary-rdf.c:281
-msgid "There was an error downloading news feed"
-msgstr "�vyko klaida parsiun�iant naujien� �altin�"
-
-#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
-msgid "<b>Error downloading RDF</b>"
+#: my-evolution/e-summary-rdf.c:297 my-evolution/e-summary-rdf.c:382
+#: my-evolution/e-summary-rdf.c:415
+#, fuzzy
+msgid "Error downloading RDF"
 msgstr "<b>Klaida parsiun�iant RDF</b>"
 
-#: my-evolution/e-summary-rdf.c:479
+#: my-evolution/e-summary-rdf.c:507
 msgid "News Feed"
 msgstr "Naujien� �altinis"
 
-#: my-evolution/e-summary-tasks.c:213
+#: my-evolution/e-summary-tasks.c:238
 msgid "No tasks"
 msgstr "N�ra u�duo�i�"
 
-#: my-evolution/e-summary-weather.c:57
+#: my-evolution/e-summary-tasks.c:277
+#, fuzzy
+msgid "(No Description)"
+msgstr "Apra�ymas:"
+
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr "Mano orai"
 
-#: my-evolution/e-summary-weather.c:324
+#: my-evolution/e-summary-weather.c:349
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr "<dd><b>Nepavyko susisiekti su or� serveriu</b></dd>"
 
-#: my-evolution/e-summary-weather.c:512
+#: my-evolution/e-summary-weather.c:539
 msgid "Weather"
 msgstr "Orai"
 
-#: my-evolution/e-summary-weather.c:664
+#: my-evolution/e-summary-weather.c:691
 msgid "Regions"
 msgstr "Regionai"
 
-#: my-evolution/e-summary.c:145
+#: my-evolution/e-summary.c:187
 msgid "%A, %B %e %Y"
 msgstr "%A, %Y m. %B %e"
 
-#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:568 ui/my-evolution.xml.h:3
 msgid "Print Summary"
 msgstr "Spausdinti ap�valg�"
 
-#: my-evolution/e-summary.c:518
+#: my-evolution/e-summary.c:614
 msgid "Printing of Summary failed"
 msgstr "Nepavyko atspausdinti ap�valgos"
 
-#: my-evolution/main.c:52
+#: my-evolution/main.c:67
 #, fuzzy
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
@@ -10812,14 +11330,27 @@ msgstr "_metriniai"
 msgid "The Evolution shell."
 msgstr "Evolution apvalkalas."
 
-#: shell/e-activity-handler.c:199
+#: shell/e-activity-handler.c:200
 msgid "Show Details"
 msgstr "Rodyti detales"
 
-#: shell/e-activity-handler.c:201
+#: shell/e-activity-handler.c:202
 msgid "Cancel Operation"
 msgstr "Nutraukti veiksm�"
 
+#: shell/e-local-storage.c:175 shell/e-shortcuts.c:1053
+msgid "Inbox"
+msgstr "Gauti lai�kai"
+
+#: shell/e-local-storage.c:176
+msgid "Outbox"
+msgstr "Siun�iami lai�kai"
+
+#: shell/e-local-storage.c:624
+#, fuzzy
+msgid "Local Folders"
+msgstr "Ypatingi aplankai"
+
 #: shell/e-setup.c:125
 msgid "Evolution installation"
 msgstr "Evolution �diegimas"
@@ -10892,37 +11423,37 @@ msgstr ""
 "Evolution katalogas. Pra�au, perkelk j�, kad \n"
 "gal��iau �diegti Evolution vartotojo bylas."
 
-#: shell/e-shell-folder-commands.c:174
+#: shell/e-shell-folder-commands.c:176
 msgid "Cannot move a folder over itself."
 msgstr "Negalima aplanko perkelti � j� pat�."
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:178
 msgid "Cannot copy a folder over itself."
 msgstr "Negalima aplanko kopijuoti � j� pat�."
 
-#: shell/e-shell-folder-commands.c:190
+#: shell/e-shell-folder-commands.c:192
 msgid "Cannot move a folder into one of its descendants."
 msgstr "Negalima perkelti aplanko � vien� i� jo palikuoni�."
 
-#: shell/e-shell-folder-commands.c:289
+#: shell/e-shell-folder-commands.c:312
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "Nurodyk aplank�, � kur� kopijuoti aplank� \"%s\":"
 
-#: shell/e-shell-folder-commands.c:294
+#: shell/e-shell-folder-commands.c:317
 msgid "Copy folder"
 msgstr "Kopijuoti aplank�"
 
-#: shell/e-shell-folder-commands.c:332
+#: shell/e-shell-folder-commands.c:359
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "Nurodyk aplank�, � kur� perkelti aplank� \"%s\":"
 
-#: shell/e-shell-folder-commands.c:337
+#: shell/e-shell-folder-commands.c:364
 msgid "Move folder"
 msgstr "Perkelti aplank�"
 
-#: shell/e-shell-folder-commands.c:362
+#: shell/e-shell-folder-commands.c:390
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -10931,33 +11462,35 @@ msgstr ""
 "Negal�jau i�trinti aplanko:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:378
-#, c-format
-msgid "Delete folder '%s'"
-msgstr "I�trinti aplank� '%s'"
+#: shell/e-shell-folder-commands.c:406
+#, fuzzy, c-format
+msgid "Delete \"%s\""
+msgstr "I�trinti"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:388
-#, c-format
-msgid "Are you sure you want to remove the '%s' folder?"
+#: shell/e-shell-folder-commands.c:416
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the \"%s\" folder?"
 msgstr "Ar tu tikrai nori i�trinti aplank� '%s'?"
 
-#. Popup a dialog asking what the user would like to rename
-#. the folder to
-#: shell/e-shell-folder-commands.c:463
-#, c-format
-msgid "Rename folder '%s'"
-msgstr "Pervadinti aplank� �%s�"
+#: shell/e-shell-folder-commands.c:470
+#, fuzzy, c-format
+msgid ""
+"Cannot rename folder:\n"
+"%s"
+msgstr ""
+"Negal�jau i�trinti aplanko:\n"
+"%s"
 
-#: shell/e-shell-folder-commands.c:467
-msgid "Rename"
-msgstr "Pervadinti"
+#: shell/e-shell-folder-commands.c:503
+#, fuzzy, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "Pervadinti aplank� �%s�"
 
-#. Make, pack the label
-#: shell/e-shell-folder-commands.c:475
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "Aplanko pavadinimas:"
+#: shell/e-shell-folder-commands.c:506
+#, fuzzy
+msgid "Rename folder"
+msgstr "Pervadinti aplank� �%s�"
 
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
@@ -10994,7 +11527,7 @@ msgstr "Nurodytas aplanko vardas yra negalimas: %s"
 msgid "Evolution - Create new folder"
 msgstr "Evolution -- Sukurti nauj� aplank�"
 
-#: shell/e-shell-folder-selection-dialog.c:98
+#: shell/e-shell-folder-selection-dialog.c:99
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -11002,15 +11535,19 @@ msgstr ""
 "Pasirinkto aplanko tipas yra netinkamas\n"
 "pra�yt�jam veiksmui."
 
-#: shell/e-shell-folder-selection-dialog.c:348
+#: shell/e-shell-folder-selection-dialog.c:360
 msgid "New..."
 msgstr "Naujas..."
 
-#: shell/e-shell-folder-title-bar.c:582 shell/e-shell-folder-title-bar.c:583
+#: shell/e-shell-folder-title-bar.c:585 shell/e-shell-folder-title-bar.c:586
 msgid "(Untitled)"
 msgstr "(Bevardis)"
 
-#: shell/e-shell-importer.c:101
+#: shell/e-shell-importer.c:141
+msgid "Choose the type of importer to run"
+msgstr ""
+
+#: shell/e-shell-importer.c:144
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -11024,9 +11561,16 @@ msgstr ""
 "Gali pasirinkti �Automati�kas� jei tu ne�inai, ir Evolution bandys "
 "susigaudyti pati."
 
+#: shell/e-shell-importer.c:150
+#, fuzzy
+msgid "Please select the information that you would like to import"
+msgstr ""
+"Pra�om pasirinkti informacij�,\n"
+"kuri� nor�tum importuoti"
+
 #. Importer isn't ready yet.
 #. Wait 5 seconds and try again.
-#: shell/e-shell-importer.c:196
+#: shell/e-shell-importer.c:242
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11037,7 +11581,7 @@ msgstr ""
 "Importeris nepasiruo��s.\n"
 "Laukiu 5 sekundes kol bandysiu v�l."
 
-#: shell/e-shell-importer.c:216 shell/e-shell-importer.c:247
+#: shell/e-shell-importer.c:262 shell/e-shell-importer.c:293
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11046,12 +11590,16 @@ msgstr ""
 "Importuojama %s\n"
 "Importuojamas elementas %d."
 
-#: shell/e-shell-importer.c:348
+#: shell/e-shell-importer.c:396
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "N�ra tokio aplanko �%s�."
 
-#: shell/e-shell-importer.c:365
+#: shell/e-shell-importer.c:408
+msgid "You may only import to local folders"
+msgstr ""
+
+#: shell/e-shell-importer.c:423
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -11060,11 +11608,11 @@ msgstr ""
 "N�ra importerio, kuris gal�t� suprasti\n"
 "%s"
 
-#: shell/e-shell-importer.c:377
+#: shell/e-shell-importer.c:433
 msgid "Importing"
 msgstr "Importuojama"
 
-#: shell/e-shell-importer.c:385
+#: shell/e-shell-importer.c:441
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -11073,17 +11621,17 @@ msgstr ""
 "Importuojama %s.\n"
 "Pradedama %s"
 
-#: shell/e-shell-importer.c:398
+#: shell/e-shell-importer.c:454
 #, c-format
 msgid "Error starting %s"
 msgstr "Klaida pradedant %s"
 
-#: shell/e-shell-importer.c:417
+#: shell/e-shell-importer.c:473
 #, c-format
 msgid "Error loading %s"
 msgstr "Klaida �keliant %s"
 
-#: shell/e-shell-importer.c:434
+#: shell/e-shell-importer.c:490
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11092,66 +11640,75 @@ msgstr ""
 "Importuojama %s\n"
 "Importuojamas elementas 1."
 
-#: shell/e-shell-importer.c:505
+#: shell/e-shell-importer.c:560
 msgid "Automatic"
 msgstr "Automati�kas"
 
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:611
 msgid "Filename:"
 msgstr "Bylos vardas:"
 
-#: shell/e-shell-importer.c:560
+#: shell/e-shell-importer.c:616
 msgid "Select a file"
 msgstr "Pasirink byl�"
 
-#: shell/e-shell-importer.c:570
+#: shell/e-shell-importer.c:626
 msgid "File type:"
 msgstr "Bylos tipas:"
 
-#: shell/e-shell-importer.c:639
+#: shell/e-shell-importer.c:651
+msgid "Import data and settings from older programs"
+msgstr ""
+
+#: shell/e-shell-importer.c:655
+#, fuzzy
+msgid "Import a single file"
+msgstr "Importuoti i�orin� byl�"
+
+#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:582
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:585
+msgid "Starting Intelligent Importers"
+msgstr ""
+
+#: shell/e-shell-importer.c:840 shell/e-shell-startup-wizard.c:703
+#, fuzzy, c-format
+msgid "From %s:"
+msgstr "Nuo:"
+
+#: shell/e-shell-importer.c:1003
 msgid "Select folder"
 msgstr "Pasirink aplank�"
 
-#: shell/e-shell-importer.c:640
+#: shell/e-shell-importer.c:1004
 msgid "Select a destination folder for importing this data"
 msgstr "Pasirink aplank�, � kur� importuoti �iuos duomenis"
 
-#: shell/e-shell-importer.c:701 shell/importer/intelligent.c:194
+#: shell/e-shell-importer.c:1116 shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "Importuoti"
 
-#: shell/e-shell-offline-handler.c:564
+#: shell/e-shell-offline-handler.c:562
 msgid "Closing connections..."
 msgstr "U�daromos jungtys..."
 
-#: shell/e-shell-startup-wizard.c:161
+#: shell/e-shell-startup-wizard.c:159
 #, c-format
 msgid ""
 "Could not start the Evolution Mailer Wizard interface\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:170
+#: shell/e-shell-startup-wizard.c:168
 #, fuzzy
 msgid "Cannot initialize the Evolution Mailer Wizard interface"
 msgstr "Negal�jau inicializuoti Evolution apvalkalo."
 
-#: shell/e-shell-startup-wizard.c:584
-msgid ""
-"Please wait...\n"
-"Scanning for existing setups"
-msgstr ""
-
-#: shell/e-shell-startup-wizard.c:587
-msgid "Starting Intelligent Importers"
-msgstr ""
-
-#: shell/e-shell-startup-wizard.c:705
-#, fuzzy, c-format
-msgid "From %s:"
-msgstr "Nuo:"
-
-#: shell/e-shell-startup-wizard.c:747
+#: shell/e-shell-startup-wizard.c:745
 msgid ""
 "Please select the information\n"
 "that you would like to import"
@@ -11159,24 +11716,24 @@ msgstr ""
 "Pra�om pasirinkti informacij�,\n"
 "kuri� nor�tum importuoti"
 
-#: shell/e-shell-view-menu.c:183
+#: shell/e-shell-view-menu.c:201
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy nerastas tavo kelyje ($PATH)."
 
-#: shell/e-shell-view-menu.c:191
+#: shell/e-shell-view-menu.c:209
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy negal�jo b�ti paleistas."
 
-#: shell/e-shell-view-menu.c:217
+#: shell/e-shell-view-menu.c:235
 #, fuzzy
 msgid "Ximian Evolution"
 msgstr "Evolution"
 
-#: shell/e-shell-view-menu.c:219
+#: shell/e-shell-view-menu.c:237
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:221
+#: shell/e-shell-view-menu.c:239
 #, fuzzy
 msgid ""
 "Ximian Evolution is a suite of groupware applications\n"
@@ -11187,27 +11744,36 @@ msgstr ""
 "pa�tui, kalendoriams ir kontakt� tvarkymui\n"
 "GNOME darbo aplinkoje."
 
-#: shell/e-shell-view-menu.c:423
+#: shell/e-shell-view-menu.c:442
 msgid "Go to folder..."
 msgstr "Eiti � aplank�..."
 
-#: shell/e-shell-view-menu.c:424
+#: shell/e-shell-view-menu.c:443
 msgid "Select the folder that you want to open"
 msgstr "Pasirink aplank�, kur� nor�tum atidaryti"
 
-#: shell/e-shell-view-menu.c:569
+#: shell/e-shell-view-menu.c:563
 msgid "Create a new shortcut"
 msgstr "Sukurti nauj� trump�"
 
-#: shell/e-shell-view-menu.c:570
+#: shell/e-shell-view-menu.c:564
 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:684
+#: shell/e-shell-view-menu.c:595
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:603
+#, fuzzy, c-format
+msgid "Error executing %s."
+msgstr "Klaida vykdant filtr�: %s: %s"
+
+#: shell/e-shell-view-menu.c:705
 msgid "Work Online"
 msgstr "Dirbti atsijungus"
 
-#: shell/e-shell-view-menu.c:697 shell/e-shell-view-menu.c:710
+#: shell/e-shell-view-menu.c:718 shell/e-shell-view-menu.c:731
 #: ui/evolution.xml.h:30
 msgid "Work Offline"
 msgstr "Dirbti atsijungus"
@@ -11216,50 +11782,50 @@ msgstr "Dirbti atsijungus"
 msgid "(No folder displayed)"
 msgstr "(Joks aplankas nerodomas)"
 
-#: shell/e-shell-view.c:1495
+#: shell/e-shell-view.c:1512
 #, fuzzy, c-format
 msgid "%s (%d)"
 msgstr "%s (...)"
 
-#: shell/e-shell-view.c:1497
+#: shell/e-shell-view.c:1514
 #, fuzzy
 msgid "(None)"
 msgstr "(jokio)"
 
-#: shell/e-shell-view.c:1502
+#: shell/e-shell-view.c:1519
 #, fuzzy, c-format
 msgid "%s - Ximian Evolution %s"
 msgstr "%s - Evolution %s"
 
-#: shell/e-shell-view.c:1504
+#: shell/e-shell-view.c:1521
 #, fuzzy, c-format
 msgid "%s - Ximian Evolution %s [%s]"
 msgstr "%s - Evolution %s [%s]"
 
-#: shell/e-shell-view.c:1544
+#: shell/e-shell-view.c:1561
 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:1551
+#: shell/e-shell-view.c:1568
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution dabar yra atsijungimo procese."
 
-#: shell/e-shell-view.c:1557
+#: shell/e-shell-view.c:1574
 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:509
+#: shell/e-shell.c:562
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1440
+#: shell/e-shell.c:1488
 #, c-format
 msgid ""
 "Ooops!  The views for `%s' have died unexpectedly.  :-(\n"
@@ -11268,23 +11834,23 @@ msgstr ""
 "Vaje!  �%s� rodiniai netik�tai numir�.  :-(\n"
 "Tikriausiai tai rei�kia, kad %s komponentas nul��o."
 
-#: shell/e-shell.c:1644 widgets/misc/e-cell-date-edit.c:248
+#: shell/e-shell.c:1692 widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "Gerai"
 
-#: shell/e-shell.c:1646
+#: shell/e-shell.c:1694
 msgid "Invalid arguments"
 msgstr "Blogi argumentai"
 
-#: shell/e-shell.c:1648
+#: shell/e-shell.c:1696
 msgid "Cannot register on OAF"
 msgstr "Negaliu u�siregistruoti OAF"
 
-#: shell/e-shell.c:1650
+#: shell/e-shell.c:1698
 msgid "Configuration Database not found"
 msgstr "Konfig�racijos duombaz� nerasta"
 
-#: shell/e-shell.c:1652 shell/e-storage.c:491
+#: shell/e-shell.c:1700 shell/e-storage.c:496
 msgid "Generic error"
 msgstr "Bendroji klaida"
 
@@ -11309,167 +11875,172 @@ msgstr ""
 msgid "Don't remove"
 msgstr "Nepa�alinti"
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:210
 msgid "Rename Shortcut Group"
 msgstr "Pervadinti trumpi� grup�"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:211
 msgid "Rename selected shortcut group to:"
 msgstr "Pervadinti pasirinkt� trumpi� grup� �:"
 
-#: shell/e-shortcuts-view.c:223
+#: shell/e-shortcuts-view.c:225
 msgid "_Small Icons"
 msgstr "_Ma�os ikonos"
 
-#: shell/e-shortcuts-view.c:224
+#: shell/e-shortcuts-view.c:226
 msgid "Show the shortcuts as small icons"
 msgstr "Rodyti trumpes kaip ma�as ikonas"
 
-#: shell/e-shortcuts-view.c:226
+#: shell/e-shortcuts-view.c:228
 msgid "_Large Icons"
 msgstr "_Didel�s ikonos"
 
-#: shell/e-shortcuts-view.c:227
+#: shell/e-shortcuts-view.c:229
 msgid "Show the shortcuts as large icons"
 msgstr "Rodyti trumpes kaip dideles ikonas"
 
-#: shell/e-shortcuts-view.c:238
+#: shell/e-shortcuts-view.c:240
 msgid "_New Group..."
 msgstr "_Nauja grup�..."
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:241
 msgid "Create a new shortcut group"
 msgstr "Sukurti nauj� trumpi� grup�"
 
-#: shell/e-shortcuts-view.c:241
+#: shell/e-shortcuts-view.c:243
 msgid "_Remove this Group..."
 msgstr "_Pa�alinti �i� grup�..."
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:244
 msgid "Remove this shortcut group"
 msgstr "Pa�alinti �i� trumpi� grup�"
 
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:246
 msgid "Re_name this Group..."
 msgstr "_Pervadinti �i� grup�..."
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:247
 msgid "Rename this shortcut group"
 msgstr "Pervadinti �i� trumpi� grup�"
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:252
 msgid "_Hide the Shortcut Bar"
 msgstr "_Pasl�pti trumpi� juost�"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:253
 msgid "Hide the shortcut bar"
 msgstr "Pasl�pti trumpi� juost�"
 
-#: shell/e-shortcuts-view.c:370
+#: shell/e-shortcuts-view.c:372
 msgid "Rename shortcut"
 msgstr "Pervadinti trump�"
 
-#: shell/e-shortcuts-view.c:371
+#: shell/e-shortcuts-view.c:373
 msgid "Rename selected shortcut to:"
 msgstr "Pervadinti pasirinkt� trump� �:"
 
-#: shell/e-shortcuts-view.c:383
+#: shell/e-shortcuts-view.c:385
 msgid "Open the folder linked to this shortcut"
 msgstr "Atidaryti aplank�, susiet� su �ia trumpe"
 
-#: shell/e-shortcuts-view.c:385 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:387 ui/evolution.xml.h:19
 msgid "Open in New _Window"
 msgstr "Atidaryti naujame _lange"
 
-#: shell/e-shortcuts-view.c:385
+#: shell/e-shortcuts-view.c:387
 #, 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:388
+#: shell/e-shortcuts-view.c:390
 #, fuzzy
 msgid "_Rename"
 msgstr "Pervadinti"
 
-#: shell/e-shortcuts-view.c:388
+#: shell/e-shortcuts-view.c:390
 msgid "Rename this shortcut"
 msgstr "Pervadinti �i� trump�"
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:392
 #, fuzzy
 msgid "Re_move"
 msgstr "Pa�alinti"
 
-#: shell/e-shortcuts-view.c:390
+#: shell/e-shortcuts-view.c:392
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Pa�alinti �i� trump� i� trumpi� juostos"
 
-#: shell/e-shortcuts.c:642
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "Klaida i�saugant trumpes."
 
-#: shell/e-shortcuts.c:1045
+#: shell/e-shortcuts.c:1044
 msgid "Shortcuts"
 msgstr "Trump�s"
 
-#: shell/e-shortcuts.c:1054
-msgid "Inbox"
-msgstr "Gauti lai�kai"
+#: shell/e-storage-set-view.c:645
+#, fuzzy, c-format
+msgid ""
+"Cannot transfer folder:\n"
+"%s"
+msgstr ""
+"Negal�jau i�trinti aplanko:\n"
+"%s"
 
 #: shell/e-storage.c:182 shell/e-storage.c:188
 msgid "(No name)"
 msgstr "(Be pavadinimo)"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:494
 msgid "No error"
 msgstr "N�ra klaid�"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:498
 msgid "A folder with the same name already exists"
 msgstr "Jau yra aplankas su tokiu pat pavadinimu"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:500
 msgid "The specified folder type is not valid"
 msgstr "Nurodytas aplanko tipas yra blogas"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:502
 msgid "I/O error"
 msgstr "I/O klaida"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:504
 msgid "Not enough space to create the folder"
 msgstr "Neu�tenka vietos aplankui sukurti"
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:506
 msgid "The specified folder was not found"
 msgstr "Nurodytas aplankas nerastas"
 
-#: shell/e-storage.c:503
+#: shell/e-storage.c:508
 msgid "Function not implemented in this storage"
 msgstr "Funkcija ne�gyvendinta �ioje saugykloje"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:512
 msgid "Operation not supported"
 msgstr "Veiksmas nepalaikomas"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:514
 msgid "The specified type is not supported in this storage"
 msgstr "Nurodytas tipas �ioje saugykloje nepalaikomas"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:516
 msgid "The specified folder cannot be modified or removed"
 msgstr "Nurodytas aplankas negali b�ti pakeistas ar i�trintas"
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:518
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Negalima padaryti aplanko vaiku vienu i� savo palikuoni�"
 
-#: shell/e-task-widget.c:170
+#: shell/e-task-widget.c:192
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: shell/e-task-widget.c:175
+#: shell/e-task-widget.c:197
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% u�baigta)"
@@ -11490,6 +12061,10 @@ msgstr "Hostas"
 msgid "The following connections are currently active:"
 msgstr "�emiau nurodytos jungtys �iuo metu yra aktyvios:"
 
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr "Aplanko pavadinimas:"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder type:"
 msgstr "Aplanko tipas:"
@@ -11542,15 +12117,27 @@ msgid "Evolution Importer Assistant"
 msgstr "Evolution importavimo pad�j�jas"
 
 #: shell/importer/import.glade.h:4
-msgid "Import File (Step 2 of 2)"
+#, fuzzy
+msgid "Import File (step 3 of 3)"
 msgstr "Importuoti byl� (�ingsnis 2 i� 2)"
 
 #: shell/importer/import.glade.h:5
-msgid "Select a File (step 1 of 2)"
-msgstr "Pasirinkti byl� (�ingsnis 1 i� 2)"
+#, fuzzy
+msgid "Importer Type (step 1 of 3)"
+msgstr "Importuoti byl� (�ingsnis 2 i� 2)"
 
 #: shell/importer/import.glade.h:6
 #, fuzzy
+msgid "Select Importers (step 2 of 3)"
+msgstr "Pasirinkti byl� (�ingsnis 1 i� 2)"
+
+#: shell/importer/import.glade.h:7
+#, fuzzy
+msgid "Select a File (step 2 of 3)"
+msgstr "Pasirinkti byl� (�ingsnis 1 i� 2)"
+
+#: shell/importer/import.glade.h:8
+#, fuzzy
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of\n"
@@ -11577,7 +12164,12 @@ msgstr "Kit� kart� nebeklausti"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution komponentas pa�tui tvarkyti."
 
-#: shell/main.c:95
+#: shell/main.c:82
+#, fuzzy
+msgid "Evolution is now exiting ..."
+msgstr "_Mano Evolution nuostatos..."
+
+#: shell/main.c:153
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -11611,7 +12203,7 @@ msgstr ""
 "Mes tikim�s, kad tau patiks m�s� sunkaus darbo vaisiai, ir\n"
 "laukiame tavo prisid�jimo!\n"
 
-#: shell/main.c:116
+#: shell/main.c:174
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -11620,26 +12212,26 @@ msgstr ""
 "A�i�\n"
 "Evolution komanda\n"
 
-#: shell/main.c:173
+#: shell/main.c:231
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Negal�jau inicializuoti Evolution apvalkalo."
 
-#: shell/main.c:184
+#: shell/main.c:242
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Negal�jau inicializuoti Evolution apvalkalo."
 
-#: shell/main.c:228
+#: shell/main.c:286
 #, fuzzy
 msgid "Disable splash screen"
 msgstr "U�drausti "
 
-#: shell/main.c:229
+#: shell/main.c:287
 msgid "Send the debugging output of all components to a file."
 msgstr "Si�sti vis� komponent� derinimo i�vest� � byl�."
 
-#: shell/main.c:271
+#: shell/main.c:329
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Negaliu inicializuoti Bonobo komponent� sistemos."
 
@@ -11777,13 +12369,6 @@ msgstr "_Ie�koti kontakt�"
 msgid "_Select All"
 msgstr "Pa�ym�ti _visk�"
 
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:44
-#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
-#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:19
-#: ui/my-evolution.xml.h:9
-msgid "_Tools"
-msgstr "�ran_kiai"
-
 #: ui/evolution-calendar.xml.h:2
 #, fuzzy
 msgid "Configure the calendar's settings"
@@ -11961,8 +12546,8 @@ msgstr "Pakeisti rodin� � %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:49
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:36
 msgid "_File"
 msgstr "_Byla"
@@ -11983,8 +12568,8 @@ msgstr "I�saugoti kontakt� ir u�daryti dialogo lang�"
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:54
-#: ui/evolution-signature-editor.xml.h:11
+#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Save"
 msgstr "I�_saugoti"
 
@@ -12583,6 +13168,11 @@ msgstr "_Normalus rodymas"
 msgid "_Open Message"
 msgstr "_Atidaryti lai�k�"
 
+#: ui/evolution-mail-message.xml.h:98 ui/evolution.xml.h:49
+#: ui/my-evolution.xml.h:9
+msgid "_Tools"
+msgstr "�ran_kiai"
+
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "U�daryti �� lang�"
@@ -12594,8 +13184,8 @@ msgstr "U�daryti �� lang�"
 msgid "_Close"
 msgstr "_U�daryti"
 
-#: ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:48
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:50
 msgid "_View"
 msgstr "_Rodyti"
 
@@ -12616,7 +13206,8 @@ msgid "Encrypt this message with PGP"
 msgstr "U��ifruoti �� lai�k� su PGP"
 
 #: ui/evolution-message-composer.xml.h:7
-msgid "Encrypt this message with your S/MIME Encryption Certificate"
+#, fuzzy
+msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "U��ifruoti �� lai�k� tavo S/MIME �ifravimo sertifikatu"
 
 #: ui/evolution-message-composer.xml.h:8
@@ -12757,36 +13348,31 @@ msgid "_Cc Field"
 msgstr "_Cc laukas"
 
 #: ui/evolution-message-composer.xml.h:46
-#: ui/evolution-signature-editor.xml.h:6
-msgid "_Debug"
-msgstr "_Derinti"
-
-#: ui/evolution-message-composer.xml.h:47
 msgid "_Delete all"
 msgstr "_I�trinti visk�"
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:49
 msgid "_From Field"
 msgstr "_Nuo laukas"
 
-#: ui/evolution-message-composer.xml.h:51
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-signature-editor.xml.h:9
 msgid "_Insert"
 msgstr "�terpt_i"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:51
 msgid "_Open..."
 msgstr "_Atidaryti..."
 
-#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Reply-To Field"
 msgstr "_Atsakyti-kam laukas"
 
-#: ui/evolution-message-composer.xml.h:55
+#: ui/evolution-message-composer.xml.h:54
 msgid "_Security"
 msgstr "_Saugumas"
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "_Pagalba"
 
@@ -12919,8 +13505,8 @@ msgid "Exit the program"
 msgstr "I�eiti i� programos"
 
 #: ui/evolution.xml.h:15
-msgid "Import an external file format"
-msgstr "Importuoti i�orin� byl�"
+msgid "Import data from other programs"
+msgstr ""
 
 #: ui/evolution.xml.h:17
 msgid "Move this folder to another place"
@@ -12991,8 +13577,9 @@ msgid "_Go to Folder..."
 msgstr "_Eiti � aplank�..."
 
 #: ui/evolution.xml.h:41
-msgid "_Import File..."
-msgstr "_Importuoti byl�..."
+#, fuzzy
+msgid "_Import..."
+msgstr "Importuojama"
 
 #: ui/evolution.xml.h:42
 msgid "_Move..."
@@ -13007,18 +13594,23 @@ msgid "_New Folder"
 msgstr "_Naujas aplankas"
 
 #: ui/evolution.xml.h:45
+#, fuzzy
+msgid "_Pilot Settings..."
+msgstr "_Pa�to nuostatos..."
+
+#: ui/evolution.xml.h:46
 msgid "_Rename..."
 msgstr "Pe_rvadinti..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:47
 msgid "_Shortcut"
 msgstr "_Trump�"
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:48
 msgid "_Shortcut Bar"
 msgstr "_Trumpi� juosta"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:51
 msgid "_Work Offline"
 msgstr "_Dirbti atsijungus"
 
@@ -13093,81 +13685,6 @@ msgid ""
 " Use the right mouse button to zoom out."
 msgstr ""
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
-msgid "%A, %B %d, %Y"
-msgstr "%A, %Y m. %B %e"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:394
-msgid "Out of Office"
-msgstr "Nesu darbe"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:395
-msgid "No Information"
-msgstr "N�ra informacijos"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:411
-msgid "_Invite Others..."
-msgstr "Pakv_iesti kitus..."
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:431
-msgid "_Options"
-msgstr "_Parinktys"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:448
-msgid "Show _Only Working Hours"
-msgstr "Rodyti tik _darbo valandas"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:461
-msgid "Show _Zoomed Out"
-msgstr "Rodyti _atitraukt�"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:479
-msgid "_Update Free/Busy"
-msgstr "_Atnaujinti Laisvas/U�imtas"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:497
-msgid "_<<"
-msgstr "_<<"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:514
-msgid "_Autopick"
-msgstr "_Automati�kai parinkti"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:528
-msgid ">_>"
-msgstr ">_>"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:545
-msgid "_All People and Resources"
-msgstr "_Visi �mon�s ir resursai"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:558
-msgid "All _People and One Resource"
-msgstr "Visi �_mon�s ir vienas resursas"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:571
-msgid "_Required People"
-msgstr "_B�tini �mon�s"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:584
-msgid "Required People and _One Resource"
-msgstr "B�tini �mon�s ir _vienas resursas"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:607
-msgid "Meeting _start time:"
-msgstr "Susitikimo _prad�ios laikas:"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:631
-msgid "Meeting _end time:"
-msgstr "Susitikimo pa_baigos laikas:"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:744
-msgid "All Attendees"
-msgstr "Visi dalyviai"
-
 #: widgets/menus/gal-view-menus.c:218
 msgid "_Current View"
 msgstr "_Esamas vaizdas"
@@ -13187,11 +13704,11 @@ msgstr "PATKP�S"
 msgid "%B %Y"
 msgstr "%Y %B"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:433
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:439
 msgid "Now"
 msgstr "Dabar"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:445
 msgid "Today"
 msgstr "Dabar"
 
@@ -13334,24 +13851,128 @@ msgstr "Asmeninis Adres� knygel�s serveris"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr ""
 
-#: wombat/wombat.c:173
+#: wombat/wombat.c:176
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): negal�jau inicializuoti GNOME-VFS"
 
-#: wombat/wombat.c:185
+#: wombat/wombat.c:188
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): negal�jau inicializuoti GNOME"
 
-#: wombat/wombat.c:198
+#: wombat/wombat.c:201
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 
+#~ msgid "Reminder of your appointment at "
+#~ msgstr "Priminti man apie �vyk� "
+
+#~ msgid "Snooze"
+#~ msgstr "U�tildyti"
+
+#~ msgid "Ok"
+#~ msgstr "Gerai"
+
+#~ msgid ""
+#~ "It is %s.  The Unix time is %ld right now.  We just thought you may like "
+#~ "to know."
+#~ msgstr ""
+#~ "Dabar yra %s. Unix laikas dabar yra %ld. Mes tiesiog pagalvojome, kad tu "
+#~ "gali nor�ti �inoti."
+
+#~ msgid "%d"
+#~ msgstr "%d"
+
+#~ msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
+#~ msgstr ""
+#~ "Prioritetas turi b�ti �Auk�tas�, �Normalus�, ��emas� arba �Neapibr��tas�."
+
+#~ msgid "before start of appointment"
+#~ msgstr "prie� �vykio prad�i�"
+
+#~ msgid "after start of appointment"
+#~ msgstr "po �vykio prad�ios"
+
+#~ msgid "before end of appointment"
+#~ msgstr "prie� �vykio pabaig�"
+
+#~ msgid "I couldn't update your calendar file!\n"
+#~ msgstr "A� negal�jau atnaujinti tavo kalendoriaus bylos!\n"
+
+#~ msgid "No password provided."
+#~ msgstr "Nepateiktas slapta�odis."
+
+#, fuzzy
+#~ msgid "No plaintext to encrypt."
+#~ msgstr "Paspausk ant ikonos, kad i��ifruotum."
+
+#~ msgid "No recipients specified"
+#~ msgstr "Nenurodyti jokie gav�jai"
+
+#~ msgid "Summarizing folder"
+#~ msgstr "Daroma aplanko santrauka"
+
+#~ msgid "Could not open folder: %s: summarizing from position %ld: %s"
+#~ msgstr ""
+#~ "Negal�jau atidaryti aplanko: %s: daroma santrauka nuo vietos %ld: %s"
+
+#~ msgid "Cannot summarize folder: %s: %s"
+#~ msgstr "Negal�jau padaryti aplanko santraukos: %s: %s"
+
+#~ msgid ""
+#~ "Could not open file %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Negal�jau atidaryti bylos %s:\n"
+#~ "%s"
+
+#~ msgid "%d/%m/%Y"
+#~ msgstr "%Y-%m-%d"
+
+#~ msgid "%Y/%m/%d"
+#~ msgstr "%Y-%m-%d"
+
+#~ msgid "%x"
+#~ msgstr "%x"
+
+#~ msgid "Each account must have a different name."
+#~ msgstr "Visos s�skaitos privalo tur�ti skirtingus vardus."
+
+#~ msgid "Message _preview should be displayed by default"
+#~ msgstr "Lai�ko _per�i�ros sritis turi b�ti rodoma �prastai"
+
+#~ msgid "Message list should display in a _threaded fashion by default"
+#~ msgstr "Lai�k� s�ra�as �prastai turi b�ti rodomas suskirstytas _gijomis"
+
+#~ msgid "_Remember PGP Passphrase until exit"
+#~ msgstr "P_risiminti PGP slapta�od� iki i��jimo"
+
+#~ msgid "No such folder /%s"
+#~ msgstr "N�ra tokio aplanko /%s"
+
+#~ msgid "Registering '%s'"
+#~ msgstr "Registruojamas '%s'"
+
+#~ msgid "There was an error downloading news feed"
+#~ msgstr "�vyko klaida parsiun�iant naujien� �altin�"
+
+#~ msgid "Delete folder '%s'"
+#~ msgstr "I�trinti aplank� '%s'"
+
+#~ msgid "Rename"
+#~ msgstr "Pervadinti"
+
+#~ msgid "_Debug"
+#~ msgstr "_Derinti"
+
+#~ msgid "_Import File..."
+#~ msgstr "_Importuoti byl�..."
+
+#~ msgid "All Attendees"
+#~ msgstr "Visi dalyviai"
+
 #~ msgid "Factory for the Evolution addressbook component."
 #~ msgstr "Evolution adres� knygel�s komponento gamykla."
 
-#~ msgid "Other Contacts"
-#~ msgstr "Kiti kontaktai"
-
 #~ msgid "123"
 #~ msgstr "123"
 
@@ -13436,9 +14057,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "Done."
 #~ msgstr "Atlikta."
 
-#~ msgid "Removing cards..."
-#~ msgstr "Pa�alinamos kortel�s..."
-
 #~ msgid "Factory for the Evolution calendar component."
 #~ msgstr "Evolution kalendoriaus komponento gamykla."
 
@@ -13483,15 +14101,9 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "Forwarded message:\n"
 #~ msgstr "Persi�stas lai�kas:\n"
 
-#~ msgid "Trash"
-#~ msgstr "�iuk�l�s"
-
 #~ msgid "Synchronizing '%s'"
 #~ msgstr "Sinchronizuojamas '%s'"
 
-#~ msgid "VFolders"
-#~ msgstr "vAplankai"
-
 #~ msgid "%l:%M%p"
 #~ msgstr "%H:%M"
 
@@ -13501,9 +14113,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "_Refresh time (seconds):"
 #~ msgstr "_Atnaujinimo laikas (sekund�mis):"
 
-#~ msgid "Outbox"
-#~ msgstr "Siun�iami lai�kai"
-
 #~ msgid "This seems to be the first time you are running Evolution."
 #~ msgstr "Atrodo, kad tai pirmas kartas, kai tu pasileidai Evolution."
 
@@ -13552,9 +14161,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "This is a reply to a task request."
 #~ msgstr "Tai yra atsakymas � u�duoties u�klaus�."
 
-#~ msgid "The message does not appear to be properly formed"
-#~ msgstr "Atrodo, kad �is lai�kas yra blogai suformuotas"
-
 #~ msgid "The information contained in this attachment was not valid"
 #~ msgstr "Informacija, buvusi �iame priede, netinkama."
 
@@ -13665,9 +14271,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "_Index"
 #~ msgstr "_Indeksas"
 
-#~ msgid "_My Evolution Settings..."
-#~ msgstr "_Mano Evolution nuostatos..."
-
 #~ msgid "Unknown addressbook type"
 #~ msgstr "Ne�inomas adres� knygel�s tipas"
 
@@ -13696,9 +14299,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "URI"
 #~ msgstr "URI"
 
-#~ msgid "Enter password for %s"
-#~ msgstr "�vesk %s slapta�od�"
-
 #, fuzzy
 #~ msgid "Category contains"
 #~ msgstr "Varde yra"
@@ -13955,9 +14555,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "Update Calendar"
 #~ msgstr "Atnaujinti kalendori�"
 
-#~ msgid "Attendee address"
-#~ msgstr "Dalyvio adresas"
-
 #~ msgid "Attendees: "
 #~ msgstr "Dalyviai: "
 
@@ -13984,9 +14581,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "Appointment Basics"
 #~ msgstr "�vykio pagrindai"
 
-#~ msgid "Settings..."
-#~ msgstr "Nuostatos..."
-
 #~ msgid "Has category"
 #~ msgstr "Turi kategorij�"
 
@@ -13999,13 +14593,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "Send as:"
 #~ msgstr "Si�sti kaip:"
 
-#~ msgid ""
-#~ "Could not open signature file %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Negal�jau atidaryti para�o bylos %s: \n"
-#~ "%s"
-
 #~ msgid "That is not a regular file."
 #~ msgstr "Tai n�ra paprasta byla."
 
@@ -14114,9 +14701,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "Renaming old folder and opening"
 #~ msgstr "Pervadinamas senas aplankas ir atidaromas"
 
-#~ msgid "Copying messages"
-#~ msgstr "Kopijuojami lai�kai"
-
 #~ msgid "Evolution progress"
 #~ msgstr "Evolution pa�anga"
 
diff --git a/po/nn.po b/po/nn.po
index 7ec0461a10..d0fc77bdde 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-0.11\n"
-"POT-Creation-Date: 2001-09-21 18:31-0400\n"
+"POT-Creation-Date: 2001-10-01 19:06-0400\n"
 "PO-Revision-Date: 2000-09-07 20:17+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian (Nynorsk)\n"
@@ -32,172 +32,167 @@ msgid "Name"
 msgstr "Namn"
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#, fuzzy
-msgid "Family Name"
-msgstr "Fullt namn"
-
-#: addressbook/backend/ebook/e-card-simple.c:61
 #: addressbook/gui/widgets/e-addressbook-view.c:870
 #, fuzzy
 msgid "Email"
 msgstr "E-post 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:61
 #: addressbook/gui/contact-editor/e-contact-editor.c:1609
 #, fuzzy
 msgid "Primary"
 msgstr "Privat"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:61
 #, fuzzy
 msgid "Prim"
 msgstr "Privat"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card-simple.c:92
 #: addressbook/gui/contact-editor/e-contact-editor.c:1594
 #: addressbook/gui/widgets/e-addressbook-view.c:902
 #, fuzzy
 msgid "Assistant"
 msgstr "Namn p� assistent"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/gui/contact-editor/e-contact-editor.c:1595
 #: addressbook/gui/contact-editor/e-contact-editor.c:1662
 msgid "Business"
 msgstr "Firma"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/backend/ebook/e-card-simple.c:68
 #, fuzzy
 msgid "Bus"
 msgstr "Oppteke"
 
-#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/gui/contact-editor/e-contact-editor.c:1598
 msgid "Callback"
 msgstr "Ring tilbake"
 
-#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/gui/contact-editor/e-contact-editor.c:1600
 msgid "Company"
 msgstr "Firma"
 
-#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:65
 #, fuzzy
 msgid "Comp"
 msgstr "Kopier"
 
-#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/backend/ebook/e-card-simple.c:69
 #: addressbook/gui/contact-editor/e-contact-editor.c:1601
 #: addressbook/gui/contact-editor/e-contact-editor.c:1663
 msgid "Home"
 msgstr "Heim"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:67
 #: addressbook/gui/widgets/e-addressbook-view.c:877
 #, fuzzy
 msgid "Organization"
 msgstr "Organisasjon:"
 
-#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/backend/ebook/e-card-simple.c:67
 msgid "Org"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/e-contact-editor.c:1605
 #, fuzzy
 msgid "Mobile"
 msgstr "Mobil:"
 
-#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/e-contact-editor.c:1599
 #, fuzzy
 msgid "Car"
 msgstr "Teikn"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/e-contact-editor.c:1597
 #: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "Business Fax"
 msgstr "Firma-fax"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/backend/ebook/e-card-simple.c:72
 #, fuzzy
 msgid "Bus Fax"
 msgstr "Firma-fax"
 
-#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/backend/ebook/e-card-simple.c:73
 #: addressbook/gui/contact-editor/e-contact-editor.c:1603
 #: addressbook/gui/widgets/e-addressbook-view.c:883
 msgid "Home Fax"
 msgstr "Heime-faks"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/e-contact-editor.c:1596
 #, fuzzy
 msgid "Business 2"
 msgstr "Firma"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/backend/ebook/e-card-simple.c:74
 #, fuzzy
 msgid "Bus 2"
 msgstr "Oppteke"
 
-#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/backend/ebook/e-card-simple.c:75
 #: addressbook/gui/contact-editor/e-contact-editor.c:1602
 #, fuzzy
 msgid "Home 2"
 msgstr "Heim"
 
-#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/backend/ebook/e-card-simple.c:76
 #: addressbook/gui/contact-editor/e-contact-editor.c:1604
 #: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/backend/ebook/e-card-simple.c:83
 #: addressbook/gui/contact-editor/e-contact-editor.c:1606
 #: addressbook/gui/contact-editor/e-contact-editor.c:1664
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:52
 msgid "Other"
 msgstr "Anna"
 
-#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/backend/ebook/e-card-simple.c:78
 #: addressbook/gui/contact-editor/e-contact-editor.c:1607
 #: addressbook/gui/widgets/e-addressbook-view.c:888
 msgid "Other Fax"
 msgstr "Alternativ faks"
 
-#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/gui/contact-editor/e-contact-editor.c:1608
 #: addressbook/gui/widgets/e-addressbook-view.c:889
 msgid "Pager"
 msgstr "Persons�kjar"
 
-#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/backend/ebook/e-card-simple.c:80
 #: addressbook/gui/contact-editor/e-contact-editor.c:1610
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 #, fuzzy
 msgid "Radio"
 msgstr "Tilfeldig"
 
-#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/backend/ebook/e-card-simple.c:81
 #: addressbook/gui/contact-editor/e-contact-editor.c:1611
 #: addressbook/gui/widgets/e-addressbook-view.c:891
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/backend/ebook/e-card-simple.c:82
 #: addressbook/gui/widgets/e-addressbook-view.c:892
 #, fuzzy
 msgid "TTY"
 msgstr "TTY/TDD-telefon"
 
-#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/backend/ebook/e-card-simple.c:84
 #: addressbook/gui/component/e-address-popup.c:476
 #: addressbook/gui/contact-editor/e-contact-editor.c:1637
 #: addressbook/gui/widgets/e-addressbook-view.c:894
@@ -205,7 +200,7 @@ msgstr "TTY/TDD-telefon"
 msgid "Email 2"
 msgstr "E-post 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/backend/ebook/e-card-simple.c:85
 #: addressbook/gui/component/e-address-popup.c:486
 #: addressbook/gui/contact-editor/e-contact-editor.c:1638
 #: addressbook/gui/widgets/e-addressbook-view.c:895
@@ -213,128 +208,133 @@ msgstr "E-post 2"
 msgid "Email 3"
 msgstr "E-post 3"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/widgets/e-addressbook-view.c:896
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:86
 msgid "Url"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/widgets/e-addressbook-view.c:897
 #, fuzzy
 msgid "Department"
 msgstr "Avdeling:"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:87
 msgid "Dep"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/backend/ebook/e-card-simple.c:88
 #: addressbook/gui/widgets/e-addressbook-view.c:898
 #, fuzzy
 msgid "Office"
 msgstr "K&ontor:"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/backend/ebook/e-card-simple.c:88
 #, fuzzy
 msgid "Off"
 msgstr "K&ontor:"
 
-#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card-simple.c:89
 #: addressbook/gui/widgets/e-addressbook-view.c:899
 #, fuzzy
 msgid "Title"
 msgstr "Tittel:"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:90
 #: addressbook/gui/widgets/e-addressbook-view.c:900
 #, fuzzy
 msgid "Profession"
 msgstr "&Yrke:"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Prof"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:91
 #: addressbook/gui/widgets/e-addressbook-view.c:901
 #, fuzzy
 msgid "Manager"
 msgstr "Persons�kjar"
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:91
 #, fuzzy
 msgid "Man"
 msgstr "M�ndag"
 
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:92
 msgid "Ass"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card-simple.c:93
 #: addressbook/gui/widgets/e-addressbook-view.c:903
 #, fuzzy
 msgid "Nickname"
 msgstr "Kallenamn:"
 
-#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card-simple.c:93
 #, fuzzy
 msgid "Nick"
 msgstr "Kallenamn:"
 
-#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/backend/ebook/e-card-simple.c:94
 #: addressbook/gui/widgets/e-addressbook-view.c:904
 #, fuzzy
 msgid "Spouse"
 msgstr "Ektefelle"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card-simple.c:95
 #: addressbook/gui/widgets/e-addressbook-view.c:905
 #, fuzzy
 msgid "Note"
 msgstr "Ingen"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:96
 #, fuzzy
 msgid "Calendar URI"
 msgstr "Skriv ut alle"
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:96
 msgid "CALUri"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:97
 #: addressbook/gui/widgets/e-addressbook-view.c:906
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:97
 msgid "FBUrl"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:98
 #, fuzzy
 msgid "Anniversary"
 msgstr "Merkedag"
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "Anniv"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card-simple.c:99
 #, fuzzy
 msgid "Birth Date"
 msgstr "Start-dato:"
 
-#: addressbook/backend/ebook/e-card-simple.c:103
+#: addressbook/backend/ebook/e-card-simple.c:102
 #: calendar/gui/e-calendar-table.etspec.h:4
 #, fuzzy
 msgid "Categories"
 msgstr "Kategoriar"
 
+#: addressbook/backend/ebook/e-card-simple.c:103
+#, fuzzy
+msgid "Family Name"
+msgstr "Fullt namn"
+
 #: addressbook/backend/ebook/e-card.c:3564
 #, fuzzy
 msgid "Card: "
@@ -581,10 +581,10 @@ msgstr "Kort 1:"
 #: 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:1119
+#: addressbook/conduit/address-conduit.c:1167
 #: addressbook/gui/component/addressbook-factory.c:48
-#: calendar/conduits/calendar/calendar-conduit.c:1204
-#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/conduits/calendar/calendar-conduit.c:1262
+#: calendar/conduits/todo/todo-conduit.c:1034
 #: calendar/gui/alarm-notify/notify-main.c:78 calendar/gui/main.c:63
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikkje initiere Bonobo"
@@ -653,22 +653,22 @@ msgstr ""
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:681
-#: calendar/conduits/calendar/calendar-conduit.c:778
-#: calendar/conduits/todo/todo-conduit.c:592
+#: addressbook/conduit/address-conduit.c:731
+#: calendar/conduits/calendar/calendar-conduit.c:837
+#: calendar/conduits/todo/todo-conduit.c:609
 #, fuzzy
 msgid "Could not start wombat server"
 msgstr "Kunne ikkje starta underprosess."
 
-#: addressbook/conduit/address-conduit.c:682
-#: calendar/conduits/calendar/calendar-conduit.c:779
-#: calendar/conduits/todo/todo-conduit.c:593
+#: addressbook/conduit/address-conduit.c:732
+#: calendar/conduits/calendar/calendar-conduit.c:838
+#: calendar/conduits/todo/todo-conduit.c:610
 #, fuzzy
 msgid "Could not start wombat"
 msgstr "Kunne ikkje starta %1."
 
-#: addressbook/conduit/address-conduit.c:714
-#: addressbook/conduit/address-conduit.c:717
+#: addressbook/conduit/address-conduit.c:762
+#: addressbook/conduit/address-conduit.c:765
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -718,8 +718,8 @@ msgid "Factory for the sample Addressbook control"
 msgstr "Legg adresse til adresseboka"
 
 #: addressbook/gui/component/addressbook-component.c:66
-#: calendar/gui/dialogs/comp-editor-util.c:281
-#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:173
+#: calendar/gui/dialogs/comp-editor-util.c:289
+#: calendar/gui/dialogs/comp-editor-util.c:345 shell/e-local-storage.c:173
 #: shell/e-shortcuts.c:1062
 #, fuzzy
 msgid "Contacts"
@@ -740,23 +740,23 @@ msgstr "Tenar:"
 msgid "LDAP server containing contact information"
 msgstr "Les filinformasjon"
 
-#: addressbook/gui/component/addressbook-component.c:386
+#: addressbook/gui/component/addressbook-component.c:411
 #: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "New Contact"
 msgstr "&Ny kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:386
+#: addressbook/gui/component/addressbook-component.c:411
 #, fuzzy
 msgid "New _Contact"
 msgstr "&Ny kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:387
+#: addressbook/gui/component/addressbook-component.c:412
 #, fuzzy
 msgid "New Contact List"
 msgstr "&Ny kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:387
+#: addressbook/gui/component/addressbook-component.c:412
 #, fuzzy
 msgid "New Contact _List"
 msgstr "&Ny kontakt"
@@ -870,20 +870,20 @@ msgid "_Account name:"
 msgstr "Sm� ikon"
 
 #: addressbook/gui/component/addressbook-config.glade.h:22
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: 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:90 my-evolution/my-evolution.glade.h:20
+#: mail/mail-config.glade.h:91 my-evolution/my-evolution.glade.h:20
 #, fuzzy
 msgid "_Add"
 msgstr "Legg til"
 
 #: addressbook/gui/component/addressbook-config.glade.h:23
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:95
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:96
 #: ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
 #: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:16
 #, fuzzy
 msgid "_Edit"
@@ -909,39 +909,39 @@ msgstr "Lagra melding"
 msgid "Other Contacts"
 msgstr "Slett kolonne"
 
-#: addressbook/gui/component/addressbook.c:393
+#: addressbook/gui/component/addressbook.c:407
 #, fuzzy, c-format
 msgid "Please enter your email address and password for access to %s"
 msgstr "Oppgi ditt OpenPGP-passord"
 
-#: addressbook/gui/component/addressbook.c:401
+#: addressbook/gui/component/addressbook.c:415
 #, fuzzy
 msgid "LDAP Authentication"
 msgstr "Autentisering:"
 
-#: addressbook/gui/component/addressbook.c:412
+#: addressbook/gui/component/addressbook.c:426
 #, fuzzy
 msgid "Email Address:"
 msgstr "E-post-adresse:"
 
-#: addressbook/gui/component/addressbook.c:425
+#: addressbook/gui/component/addressbook.c:439
 #, fuzzy
 msgid "Password:"
 msgstr "Lagra som"
 
-#: addressbook/gui/component/addressbook.c:488
+#: addressbook/gui/component/addressbook.c:502
 #, fuzzy
 msgid "Unable to open addressbook"
 msgstr "Kan ikkje opna adresseboka."
 
-#: addressbook/gui/component/addressbook.c:495
+#: addressbook/gui/component/addressbook.c:509
 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:500
+#: addressbook/gui/component/addressbook.c:514
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -949,7 +949,7 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:508
+#: addressbook/gui/component/addressbook.c:522
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
@@ -959,41 +959,41 @@ msgstr ""
 "Sjekk at eininga finst og at du har\n"
 "skrivetilgang til ho."
 
-#: addressbook/gui/component/addressbook.c:649
+#: addressbook/gui/component/addressbook.c:663
 #: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:650
+#: addressbook/gui/component/addressbook.c:664
 msgid "Name contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:665
 #, fuzzy
 msgid "Email contains"
 msgstr "Sm� ikon"
 
-#: addressbook/gui/component/addressbook.c:652
+#: addressbook/gui/component/addressbook.c:666
 #: calendar/gui/cal-search-bar.c:59
 #, fuzzy
 msgid "Category is"
 msgstr "Kategoriar"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:653 widgets/misc/e-filter-bar.h:97
+#: addressbook/gui/component/addressbook.c:667 widgets/misc/e-filter-bar.h:97
 #: widgets/misc/e-filter-bar.h:104
 #, fuzzy
 msgid "Advanced..."
 msgstr "Legg til ..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:883
+#: addressbook/gui/component/addressbook.c:897
 #: calendar/gui/cal-search-bar.c:412
 #, fuzzy
 msgid "Any Category"
 msgstr "Kategoriar"
 
-#: addressbook/gui/component/addressbook.c:925
+#: addressbook/gui/component/addressbook.c:939
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
@@ -1007,7 +1007,7 @@ msgid "(none)"
 msgstr "(ingen)"
 
 #: addressbook/gui/component/e-address-popup.c:466
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #: addressbook/gui/contact-editor/e-contact-editor.c:1636
 msgid "Primary Email"
 msgstr "Prim�r e-post"
@@ -1197,135 +1197,141 @@ msgid "Details"
 msgstr "Detaljar"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
+msgid "F_ree/Busy URL:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 #, fuzzy
 msgid "File A_s:"
 msgstr "Arkiver som"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "General"
 msgstr "Generelt"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+msgid ""
+"If this person publishes free/busy or other calendar information on the "
+"Internet, enter the address\n"
+"of that information here."
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "New phone type"
 msgstr "Ny telefontype"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "No_tes:"
 msgstr "No_tater:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #, fuzzy
 msgid "Organi_zation:"
 msgstr "Organisasjon:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "Phone Types"
 msgstr "Telefontypar"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "Wants to receive _HTML mail"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 #, fuzzy
 msgid "_Address..."
 msgstr "Adresse"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #, fuzzy
 msgid "_Assistant's name:"
 msgstr "&Namn p� assistent:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 #, fuzzy
 msgid "_Birthday:"
 msgstr "F�dselsdag:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 #, fuzzy
 msgid "_Business"
 msgstr "Firma"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#, fuzzy
-msgid "_Calendar Information:"
-msgstr "Informasjon"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 #: calendar/gui/dialogs/event-page.glade.h:12
 #: calendar/gui/dialogs/task-page.glade.h:10
 #, fuzzy
 msgid "_Contacts..."
 msgstr "&Innhald ..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:834 filter/filter.glade.h:8
-#: mail/folder-browser.c:1371 mail/mail-config.glade.h:94
+#: mail/folder-browser.c:1406 mail/mail-config.glade.h:95
 #: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 #, fuzzy
 msgid "_Delete"
 msgstr "Slett"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #, fuzzy
 msgid "_Department:"
 msgstr "Avdeling:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#, fuzzy
-msgid "_Free/Busy Information:"
-msgstr "Informasjon"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 #, fuzzy
 msgid "_Full Name..."
 msgstr "Fullt namn"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #, fuzzy
 msgid "_Home"
 msgstr "Heim"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #, fuzzy
 msgid "_Job title:"
 msgstr "Jobb-tittel"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Manager's Name:"
 msgstr "Na_mn p� sjef:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Mobile"
 msgstr "_Mobil"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Nickname:"
 msgstr "Kalle_namn:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "_Office:"
 msgstr "K&ontor:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #, fuzzy
 msgid "_Profession:"
 msgstr "&Yrke:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#, fuzzy
+msgid "_Public Calendar URL:"
+msgstr "Skriv ut alle"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 #, fuzzy
 msgid "_Spouse:"
 msgstr "Ektefelle"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #, fuzzy
 msgid "_This is the mailing address"
 msgstr "Rediger e-post-adresser"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "_Web page address:"
 msgstr "&WINS-adresse:"
@@ -2621,7 +2627,7 @@ msgstr "sekund"
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
 #: addressbook/gui/widgets/e-addressbook-view.c:691
 #: addressbook/gui/widgets/e-addressbook-view.c:753
-#: addressbook/gui/widgets/e-addressbook-view.c:1373
+#: addressbook/gui/widgets/e-addressbook-view.c:1422
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard"
@@ -2681,8 +2687,8 @@ msgid "Success"
 msgstr "Vellukka"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1710
-#: shell/e-storage.c:515
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1702
+#: shell/e-storage.c:520
 msgid "Unknown error"
 msgstr "Ukjend feil"
 
@@ -2691,7 +2697,7 @@ msgstr "Ukjend feil"
 msgid "Repository offline"
 msgstr "depot i vcs"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:505
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:510
 msgid "Permission denied"
 msgstr "Nekta tilgang"
 
@@ -2713,10 +2719,10 @@ msgstr ""
 "%1"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:733 calendar/gui/calendar-model.c:1274
+#: calendar/gui/calendar-model.c:726 calendar/gui/calendar-model.c:1247
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:544
-#: camel/camel-service.c:580
+#: calendar/gui/e-calendar-table.c:461 camel/camel-service.c:598
+#: camel/camel-service.c:634
 msgid "Cancelled"
 msgstr "Avbroten"
 
@@ -2750,7 +2756,7 @@ msgid "Error removing list"
 msgstr "Feil ved fjerning av oppsett"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1248
+#: addressbook/gui/widgets/e-addressbook-view.c:1297
 #, fuzzy
 msgid "Error removing card"
 msgstr "Feil ved fjerning av oppsett"
@@ -3042,8 +3048,8 @@ msgstr "Skrifttype ..."
 msgid "Print cards"
 msgstr "Skriv ut alle"
 
-#: addressbook/printing/e-contact-print.c:1112
-#: addressbook/printing/e-contact-print.c:1134
+#: addressbook/printing/e-contact-print.c:1152
+#: addressbook/printing/e-contact-print.c:1174
 #, fuzzy
 msgid "Print card"
 msgstr "Skriv ut alle"
@@ -3054,20 +3060,48 @@ msgstr "Skriv ut alle"
 msgid "Print envelope"
 msgstr "Private meldingar"
 
-#: calendar/conduits/calendar/calendar-conduit.c:735
-#: calendar/conduits/todo/todo-conduit.c:548
+#: calendar/cal-util/cal-util.c:418 calendar/cal-util/cal-util.c:440
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:385 mail/message-list.c:652
+#, fuzzy
+msgid "High"
+msgstr "H�gd"
+
+#: calendar/cal-util/cal-util.c:420 calendar/cal-util/cal-util.c:442
+#: calendar/gui/calendar-model.c:1673
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:386 mail/message-list.c:651
+msgid "Normal"
+msgstr "Normal"
+
+#: calendar/cal-util/cal-util.c:422 calendar/cal-util/cal-util.c:444
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:387 mail/message-list.c:650
+#, fuzzy
+msgid "Low"
+msgstr "Senk"
+
+#. An empty string is the same as 'None'.
+#: calendar/cal-util/cal-util.c:438
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:388
+msgid "Undefined"
+msgstr ""
+
+#: calendar/conduits/calendar/calendar-conduit.c:793
+#: calendar/conduits/todo/todo-conduit.c:564
 #, fuzzy
 msgid "Error while communicating with calendar server"
 msgstr "Feil ved tilkopling til tenar."
 
-#: calendar/conduits/calendar/calendar-conduit.c:839
-#: calendar/conduits/calendar/calendar-conduit.c:842
+#: calendar/conduits/calendar/calendar-conduit.c:896
+#: calendar/conduits/calendar/calendar-conduit.c:899
 #, fuzzy
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: calendar/conduits/todo/todo-conduit.c:653
-#: calendar/conduits/todo/todo-conduit.c:656
+#: calendar/conduits/todo/todo-conduit.c:668
+#: calendar/conduits/todo/todo-conduit.c:671
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
@@ -3122,47 +3156,47 @@ msgstr ""
 msgid "Factory for the alarm notification service"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:152
 #, c-format
 msgid "Notification about your appointment starting on %s and ending on %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:156
 #, fuzzy, c-format
 msgid "Notification about your appointment starting on %s"
 msgstr "Informasjon om deg og omsetjingslaget"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:161
 #, c-format
 msgid "Notification about your appointment ending on %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:165
 #, fuzzy
 msgid "Notification about your appointment"
 msgstr "&Endra avtale ..."
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:172
 #, c-format
 msgid "Notification about your task starting on %s and ending on %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:176
 #, c-format
 msgid "Notification about your task starting on %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:181
 #, c-format
 msgid "Notification about your task ending on %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:185
 #, fuzzy
 msgid "Notification about your task"
 msgstr "P�minning"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:267
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr ""
 
@@ -3256,7 +3290,7 @@ msgstr "%1 bit %2 %3"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: calendar/gui/calendar-commands.c:467
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1442
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1446
 #, fuzzy
 msgid "%d %B"
 msgstr "%1 %2"
@@ -3266,18 +3300,18 @@ msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:399 calendar/gui/calendar-model.c:1001
-#: calendar/gui/e-calendar-table.c:307
+#: calendar/gui/calendar-model.c:399 calendar/gui/calendar-model.c:994
+#: calendar/gui/e-calendar-table.c:364
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:1003
-#: calendar/gui/e-calendar-table.c:308
+#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:996
+#: calendar/gui/e-calendar-table.c:365
 #, fuzzy
 msgid "Confidential"
 msgstr "Eksponentiell"
 
-#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:306
+#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:363
 #, fuzzy
 msgid "Public"
 msgstr "Praksis"
@@ -3300,72 +3334,51 @@ msgstr "E"
 msgid "W"
 msgstr "RW"
 
-#: calendar/gui/calendar-model.c:538 calendar/gui/calendar-model.c:1183
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:652
-#, fuzzy
-msgid "High"
-msgstr "H�gd"
-
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1185
-#: calendar/gui/calendar-model.c:1700
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:651
-msgid "Normal"
-msgstr "Normal"
-
-#: calendar/gui/calendar-model.c:542 calendar/gui/calendar-model.c:1187
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:650
-#, fuzzy
-msgid "Low"
-msgstr "Senk"
-
-#: calendar/gui/calendar-model.c:573 calendar/gui/calendar-model.c:1220
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/calendar-model.c:566 calendar/gui/calendar-model.c:1193
+#: calendar/gui/e-calendar-table.c:437
 #, fuzzy
 msgid "Free"
 msgstr "Gresk"
 
-#: calendar/gui/calendar-model.c:575 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/calendar-model.c:568 calendar/gui/e-calendar-table.c:438
 #: calendar/gui/e-meeting-time-sel.c:393
 msgid "Busy"
 msgstr "Oppteke"
 
-#: calendar/gui/calendar-model.c:724 calendar/gui/calendar-model.c:1268
+#: calendar/gui/calendar-model.c:717 calendar/gui/calendar-model.c:1241
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:401
+#: calendar/gui/e-calendar-table.c:458
 #, fuzzy
 msgid "Not Started"
 msgstr "Starta"
 
-#: calendar/gui/calendar-model.c:727 calendar/gui/calendar-model.c:1270
+#: calendar/gui/calendar-model.c:720 calendar/gui/calendar-model.c:1243
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:402
+#: calendar/gui/e-calendar-table.c:459
 #, fuzzy
 msgid "In Progress"
 msgstr "Framgong:"
 
-#: calendar/gui/calendar-model.c:730 calendar/gui/calendar-model.c:1272
+#: calendar/gui/calendar-model.c:723 calendar/gui/calendar-model.c:1245
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-meeting-model.c:298
+#: calendar/gui/e-calendar-table.c:460 calendar/gui/e-meeting-model.c:298
 #: calendar/gui/e-meeting-model.c:321
 msgid "Completed"
 msgstr "Ferdig"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:915 e-util/e-time-utils.c:163
+#: calendar/gui/calendar-model.c:908 e-util/e-time-utils.c:163
 #: e-util/e-time-utils.c:354
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr ""
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:918 e-util/e-time-utils.c:158
+#: calendar/gui/calendar-model.c:911 e-util/e-time-utils.c:158
 #: e-util/e-time-utils.c:363
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:923
+#: calendar/gui/calendar-model.c:916
 #, fuzzy, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -3373,55 +3386,44 @@ msgid ""
 "%s"
 msgstr "Ein bandindeks m� vera valt i treet."
 
-#: calendar/gui/calendar-model.c:1087
+#: calendar/gui/calendar-model.c:1080
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1127
+#: calendar/gui/calendar-model.c:1120
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1168
-msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
-msgstr ""
-
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1181
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:331
-msgid "Undefined"
-msgstr ""
-
-#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1266 calendar/gui/dialogs/meeting-page.c:332
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1444
+#: calendar/gui/calendar-model.c:1239 calendar/gui/dialogs/meeting-page.c:332
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1446
 #: mail/mail-accounts.c:143 mail/mail-accounts.c:390
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:50
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:203
-#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
-#: widgets/misc/e-dateedit.c:1428 widgets/misc/e-dateedit.c:1543
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:453
+#: widgets/misc/e-dateedit.c:1453 widgets/misc/e-dateedit.c:1568
 msgid "None"
 msgstr "Ingen"
 
-#: calendar/gui/calendar-model.c:1702
+#: calendar/gui/calendar-model.c:1675
 #, fuzzy
 msgid "Recurring"
 msgstr "Repetering"
 
-#: calendar/gui/calendar-model.c:1704
+#: calendar/gui/calendar-model.c:1677
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1710 calendar/gui/e-meeting-model.c:270
+#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:270
 #: calendar/gui/e-meeting-model.c:280 calendar/gui/e-meeting-model.c:506
 #: calendar/gui/e-meeting-model.c:702
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1710 calendar/gui/e-meeting-model.c:282
+#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:282
 #: calendar/gui/e-meeting-model.c:703
 #, fuzzy
 msgid "No"
@@ -3465,45 +3467,45 @@ msgstr "ikkje inneheld"
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/component-factory.c:62 my-evolution/my-evolution.glade.h:6
+#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:6
 #: shell/e-local-storage.c:172 shell/e-shortcuts.c:1056
 #, fuzzy
 msgid "Calendar"
 msgstr "Skriv ut alle"
 
-#: calendar/gui/component-factory.c:63
+#: calendar/gui/component-factory.c:64
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/component-factory.c:67 calendar/gui/print.c:1719
-#: my-evolution/e-summary-tasks.c:215 my-evolution/e-summary-tasks.c:231
+#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1723
+#: my-evolution/e-summary-tasks.c:237 my-evolution/e-summary-tasks.c:253
 #: shell/e-local-storage.c:178 shell/e-shortcuts.c:1059
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Oppg�ver"
 
-#: calendar/gui/component-factory.c:68
+#: calendar/gui/component-factory.c:69
 #, fuzzy
 msgid "Folder containing to-do items"
 msgstr "Fil alt i liste"
 
-#: calendar/gui/component-factory.c:593 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:581 ui/evolution-calendar.xml.h:7
 #, fuzzy
 msgid "Create a new appointment"
 msgstr "&Slett avtale"
 
-#: calendar/gui/component-factory.c:594 calendar/gui/e-day-view.c:3420
+#: calendar/gui/component-factory.c:582 calendar/gui/e-day-view.c:3422
 #, fuzzy
 msgid "New _Appointment"
 msgstr "&Vis avtale ..."
 
-#: calendar/gui/component-factory.c:599 ui/evolution-calendar.xml.h:8
+#: calendar/gui/component-factory.c:587 ui/evolution-calendar.xml.h:8
 #: ui/evolution-tasks.xml.h:5
 #, fuzzy
 msgid "Create a new task"
 msgstr "Lagar eit nytt dokument"
 
-#: calendar/gui/component-factory.c:600
+#: calendar/gui/component-factory.c:588
 #, fuzzy
 msgid "New _Task"
 msgstr "Oppg�ve"
@@ -3593,106 +3595,127 @@ msgstr "time/timar"
 msgid "minutes"
 msgstr "minutt"
 
-#: calendar/gui/dialogs/alarm-page.c:303
+#: calendar/gui/dialogs/alarm-page.c:307
 #, fuzzy, c-format
 msgid "%d days"
 msgstr " dag"
 
-#: calendar/gui/dialogs/alarm-page.c:305
+#: calendar/gui/dialogs/alarm-page.c:310
 #, fuzzy
 msgid "1 day"
 msgstr "Vis dato"
 
-#: calendar/gui/dialogs/alarm-page.c:308
+#: calendar/gui/dialogs/alarm-page.c:315
 #, fuzzy, c-format
 msgid "%d weeks"
 msgstr "Veke"
 
-#: calendar/gui/dialogs/alarm-page.c:310
+#: calendar/gui/dialogs/alarm-page.c:318
 #, fuzzy
 msgid "1 week"
 msgstr "Vis %1"
 
-#: calendar/gui/dialogs/alarm-page.c:313
+#: calendar/gui/dialogs/alarm-page.c:323
 #, fuzzy, c-format
 msgid "%d hours"
 msgstr "time/timar"
 
-#: calendar/gui/dialogs/alarm-page.c:315
+#: calendar/gui/dialogs/alarm-page.c:326
 #, fuzzy
 msgid "1 hour"
 msgstr "time/timar"
 
-#: calendar/gui/dialogs/alarm-page.c:318
+#: calendar/gui/dialogs/alarm-page.c:331
 #, fuzzy, c-format
 msgid "%d minutes"
 msgstr "minutt"
 
-#: calendar/gui/dialogs/alarm-page.c:320
+#: calendar/gui/dialogs/alarm-page.c:334
 msgid "1 minute"
 msgstr "1 minutt"
 
-#: calendar/gui/dialogs/alarm-page.c:323
+#: calendar/gui/dialogs/alarm-page.c:339
 #, fuzzy, c-format
 msgid "%d seconds"
 msgstr "sekund"
 
-#: calendar/gui/dialogs/alarm-page.c:325
+#: calendar/gui/dialogs/alarm-page.c:342
 #, fuzzy
 msgid "1 second"
 msgstr "sekund"
 
-#: calendar/gui/dialogs/alarm-page.c:350
+#: calendar/gui/dialogs/alarm-page.c:373
 #: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:354
+#: calendar/gui/dialogs/alarm-page.c:377
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 #, fuzzy
 msgid "Display a message"
 msgstr "Vis �tvaringsmelding"
 
-#: calendar/gui/dialogs/alarm-page.c:358
+#: calendar/gui/dialogs/alarm-page.c:381
 #, fuzzy
 msgid "Send an email"
 msgstr "Hentar data fr� %1"
 
-#: calendar/gui/dialogs/alarm-page.c:362
+#: calendar/gui/dialogs/alarm-page.c:385
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 #, fuzzy
 msgid "Run a program"
 msgstr "Terminalprogram:"
 
-#: calendar/gui/dialogs/alarm-page.c:368 calendar/gui/dialogs/alarm-page.c:404
-#: calendar/gui/e-meeting-model.c:226 calendar/gui/e-meeting-model.c:261
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:674
-#: calendar/gui/e-meeting-model.c:690
-#: camel/providers/smtp/camel-smtp-transport.c:224
-#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
-msgid "Unknown"
-msgstr "Ukjend"
-
-#: calendar/gui/dialogs/alarm-page.c:380
+#: calendar/gui/dialogs/alarm-page.c:391
 #, fuzzy
-msgid "before start of appointment"
+msgid "Unknown action to be performed"
+msgstr "Ukjend feil"
+
+#: calendar/gui/dialogs/alarm-page.c:403
+#, fuzzy, c-format
+msgid "%s %s before the start of the appointment"
 msgstr "&Slett avtale"
 
-#: calendar/gui/dialogs/alarm-page.c:383
-#, fuzzy
-msgid "after start of appointment"
+#: calendar/gui/dialogs/alarm-page.c:406
+#, fuzzy, c-format
+msgid "%s %s after the start of the appointment"
 msgstr "&Slett avtale"
 
-#: calendar/gui/dialogs/alarm-page.c:393
-#, fuzzy
-msgid "before end of appointment"
+#: calendar/gui/dialogs/alarm-page.c:411
+#, fuzzy, c-format
+msgid "%s at the start of the appointment"
 msgstr "&Slett avtale"
 
-#: calendar/gui/dialogs/alarm-page.c:396
-#, fuzzy
-msgid "after end of appointment"
+#: calendar/gui/dialogs/alarm-page.c:420
+#, fuzzy, c-format
+msgid "%s %s before the end of the appointment"
+msgstr "&Slett avtale"
+
+#: calendar/gui/dialogs/alarm-page.c:423
+#, fuzzy, c-format
+msgid "%s %s after the end of the appointment"
 msgstr "&Slett avtale"
 
+#: calendar/gui/dialogs/alarm-page.c:428
+#, fuzzy, c-format
+msgid "%s at the end of the appointment"
+msgstr "&Slett avtale"
+
+#: calendar/gui/dialogs/alarm-page.c:439
+#, fuzzy, c-format
+msgid "%s at an unknown time"
+msgstr "Ukjend feil"
+
+#: calendar/gui/dialogs/alarm-page.c:445
+#, fuzzy, c-format
+msgid "%s at %s"
+msgstr "Diskusjonsgruppetenarar"
+
+#: calendar/gui/dialogs/alarm-page.c:452
+#, c-format
+msgid "%s for an unknown trigger type"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 #, fuzzy
@@ -4067,63 +4090,63 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:159 calendar/gui/print.c:2128
+#: calendar/gui/dialogs/comp-editor-util.c:167 calendar/gui/print.c:2132
 #, fuzzy
 msgid " to "
 msgstr " til:"
 
-#: calendar/gui/dialogs/comp-editor-util.c:163 calendar/gui/print.c:2132
+#: calendar/gui/dialogs/comp-editor-util.c:171 calendar/gui/print.c:2136
 #, fuzzy
 msgid " (Completed "
 msgstr "Ferdig"
 
-#: calendar/gui/dialogs/comp-editor-util.c:165 calendar/gui/print.c:2134
+#: calendar/gui/dialogs/comp-editor-util.c:173 calendar/gui/print.c:2138
 #, fuzzy
 msgid "Completed "
 msgstr "Ferdig"
 
-#: calendar/gui/dialogs/comp-editor-util.c:170 calendar/gui/print.c:2139
+#: calendar/gui/dialogs/comp-editor-util.c:178 calendar/gui/print.c:2143
 #, fuzzy
 msgid " (Due "
 msgstr " Slett "
 
-#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2141
+#: calendar/gui/dialogs/comp-editor-util.c:180 calendar/gui/print.c:2145
 #, fuzzy
 msgid "Due "
 msgstr "Forfall"
 
-#: calendar/gui/dialogs/comp-editor.c:515
+#: calendar/gui/dialogs/comp-editor.c:521
 #, fuzzy
 msgid "Edit Appointment"
 msgstr "&Endra avtale ..."
 
-#: calendar/gui/dialogs/comp-editor.c:520
+#: calendar/gui/dialogs/comp-editor.c:526
 #, fuzzy, c-format
 msgid "Appointment - %s"
 msgstr "Avtale"
 
-#: calendar/gui/dialogs/comp-editor.c:523
+#: calendar/gui/dialogs/comp-editor.c:529
 #, fuzzy, c-format
 msgid "Task - %s"
 msgstr "Oppg�ver"
 
-#: calendar/gui/dialogs/comp-editor.c:526
+#: calendar/gui/dialogs/comp-editor.c:532
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:540
+#: calendar/gui/dialogs/comp-editor.c:546
 #, fuzzy
 msgid "No summary"
 msgstr "oppsummering"
 
-#: calendar/gui/dialogs/comp-editor.c:950 mail/mail-callbacks.c:1662
+#: calendar/gui/dialogs/comp-editor.c:952 mail/mail-callbacks.c:1671
 #: mail/mail-display.c:100
 #, fuzzy
 msgid "Overwrite file?"
 msgstr "Overskriv filer"
 
-#: calendar/gui/dialogs/comp-editor.c:954 mail/mail-callbacks.c:1668
+#: calendar/gui/dialogs/comp-editor.c:956 mail/mail-callbacks.c:1677
 #: mail/mail-display.c:104
 #, fuzzy
 msgid ""
@@ -4131,58 +4154,58 @@ msgid ""
 "Overwrite it?"
 msgstr "Ei fil med det namnet finst alt. Vil du skriva over den?"
 
-#: calendar/gui/dialogs/comp-editor.c:1017 ui/evolution-comp-editor.xml.h:13
+#: calendar/gui/dialogs/comp-editor.c:1019 ui/evolution-comp-editor.xml.h:13
 #: widgets/misc/e-filter-bar.h:101
 #, fuzzy
 msgid "Save As..."
 msgstr "Lagra som ..."
 
-#: calendar/gui/dialogs/comp-editor.c:1170
+#: calendar/gui/dialogs/comp-editor.c:1172
 #, fuzzy
 msgid "Unable to obtain current version!"
 msgstr "Kan ikkje setja opp utskriftstenaren."
 
-#: calendar/gui/dialogs/delete-comp.c:90
+#: calendar/gui/dialogs/delete-comp.c:91
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Er du sikker p� at du vil sletta denne klassen?"
 
-#: calendar/gui/dialogs/delete-comp.c:93
+#: calendar/gui/dialogs/delete-comp.c:94
 #, fuzzy
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Er du sikker p� at du vil sletta denne klassen?"
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:100
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Er du sikker p� at du vil sletta denne klassen?"
 
-#: calendar/gui/dialogs/delete-comp.c:102
+#: calendar/gui/dialogs/delete-comp.c:103
 #, fuzzy
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Er du sikker p� at du vil sletta denne klassen?"
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:109
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Er du sikker p� at du vil sletta denne klassen?"
 
-#: calendar/gui/dialogs/delete-comp.c:111
+#: calendar/gui/dialogs/delete-comp.c:112
 #, fuzzy
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Er du sikker p� at du vil sletta denne klassen?"
 
-#: calendar/gui/dialogs/delete-comp.c:126
+#: calendar/gui/dialogs/delete-comp.c:127
 #, fuzzy, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Er du sikker p� at du vil sletta denne klassen?"
 
-#: calendar/gui/dialogs/delete-comp.c:131
+#: calendar/gui/dialogs/delete-comp.c:132
 #, fuzzy, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Er du sikker p� at du vil sletta denne klassen?"
 
-#: calendar/gui/dialogs/delete-comp.c:136
+#: calendar/gui/dialogs/delete-comp.c:137
 #, fuzzy, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Er du sikker p� at du vil sletta denne klassen?"
@@ -4392,7 +4415,7 @@ msgstr "Status:"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:18
-#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:85
+#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:86
 #: shell/glade/e-active-connection-dialog.glade.h:5
 #, fuzzy
 msgid "Type"
@@ -4419,8 +4442,8 @@ msgstr "Andre ..."
 msgid "_Other Organizer"
 msgstr "Planleggjar"
 
-#: calendar/gui/dialogs/recurrence-page.c:422 calendar/gui/print.c:1851
-#: calendar/gui/print.c:1853 calendar/gui/print.c:1854
+#: calendar/gui/dialogs/recurrence-page.c:422 calendar/gui/print.c:1855
+#: calendar/gui/print.c:1857 calendar/gui/print.c:1858
 #, fuzzy
 msgid "%a %b %d %Y"
 msgstr "%1 bit %2 %3"
@@ -4558,7 +4581,7 @@ msgid "Progress"
 msgstr "Framgong:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:910
+#: my-evolution/e-summary-preferences.c:949
 #, fuzzy
 msgid "URL:"
 msgstr "URL:"
@@ -4581,7 +4604,7 @@ msgstr "Avtale"
 
 #: calendar/gui/dialogs/task-page.glade.h:4
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:28
 msgid "Description:"
 msgstr "Skildring:"
 
@@ -4600,113 +4623,113 @@ msgstr "Eksponentiell"
 msgid "_Due Date:"
 msgstr "Forfallsdato:"
 
-#: calendar/gui/e-calendar-table.c:350
+#: calendar/gui/e-calendar-table.c:407
 #, c-format
 msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:351
+#: calendar/gui/e-calendar-table.c:408
 #, c-format
 msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:409
 #, c-format
 msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:410
 #, c-format
 msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:411
 #, c-format
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:412
 #, c-format
 msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:356
+#: calendar/gui/e-calendar-table.c:413
 #, c-format
 msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:357
+#: calendar/gui/e-calendar-table.c:414
 #, c-format
 msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:358
+#: calendar/gui/e-calendar-table.c:415
 #, c-format
 msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:359
+#: calendar/gui/e-calendar-table.c:416
 #, c-format
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:360
+#: calendar/gui/e-calendar-table.c:417
 #, c-format
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3441
-#: calendar/gui/e-week-view.c:3288 mail/folder-browser.c:1336
+#: calendar/gui/e-calendar-table.c:914 calendar/gui/e-day-view.c:3443
+#: calendar/gui/e-week-view.c:3296 mail/folder-browser.c:1371
 #: shell/e-shortcuts-view.c:385
 #, fuzzy
 msgid "_Open"
 msgstr "Opna ..."
 
-#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3450
-#: calendar/gui/e-week-view.c:3297 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:918 calendar/gui/e-day-view.c:3452
+#: calendar/gui/e-week-view.c:3305 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 #, fuzzy
 msgid "C_ut"
 msgstr "Klipp ut"
 
-#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3452
-#: calendar/gui/e-week-view.c:3299 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:920 calendar/gui/e-day-view.c:3454
+#: calendar/gui/e-week-view.c:3307 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:14
 #, fuzzy
 msgid "_Copy"
 msgstr "Kopier"
 
-#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3427
-#: calendar/gui/e-day-view.c:3454 calendar/gui/e-week-view.c:3275
-#: calendar/gui/e-week-view.c:3301 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:922 calendar/gui/e-day-view.c:3429
+#: calendar/gui/e-day-view.c:3456 calendar/gui/e-week-view.c:3283
+#: calendar/gui/e-week-view.c:3309 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:40 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:17
 #, fuzzy
 msgid "_Paste"
 msgstr "Lim inn"
 
-#: calendar/gui/e-calendar-table.c:863
+#: calendar/gui/e-calendar-table.c:927
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "Marker alle som l&esne"
 
-#: calendar/gui/e-calendar-table.c:865
+#: calendar/gui/e-calendar-table.c:929
 #, fuzzy
 msgid "_Delete this Task"
 msgstr "Slett denne adressa"
 
-#: calendar/gui/e-calendar-table.c:868
+#: calendar/gui/e-calendar-table.c:932
 #, fuzzy
 msgid "_Mark Tasks as Complete"
 msgstr "Marker alle som l&esne"
 
-#: calendar/gui/e-calendar-table.c:870
+#: calendar/gui/e-calendar-table.c:934
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Slett den valte oppg�va"
 
-#: calendar/gui/e-calendar-table.c:1130
+#: calendar/gui/e-calendar-table.c:1194
 #: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Click to add a task"
@@ -4717,8 +4740,8 @@ msgstr "Trykk her for � leggja til ein ny virtuell vert."
 msgid "Alarms"
 msgstr "Alarm"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:702
-#: camel/camel-filter-driver.c:819
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:718
+#: camel/camel-filter-driver.c:834
 #, fuzzy
 msgid "Complete"
 msgstr "Ferdig"
@@ -4754,8 +4777,8 @@ 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:30 shell/e-shortcuts.c:1050
-#: shell/e-storage-set-view.c:1424 shell/e-summary-storage.c:80
+#: my-evolution/component-factory.c:45 shell/e-shortcuts.c:1050
+#: shell/e-storage-set-view.c:1420 shell/e-summary-storage.c:80
 msgid "Summary"
 msgstr "Samandrag"
 
@@ -4777,7 +4800,7 @@ 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:285 calendar/gui/e-day-view.c:1374
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1458
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
 msgid "%A %d %B"
 msgstr ""
 
@@ -4790,298 +4813,315 @@ msgid "%d %b"
 msgstr "%1 %2"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:608 calendar/gui/e-week-view.c:344
-#: calendar/gui/print.c:765
+#: calendar/gui/e-day-view.c:608 calendar/gui/e-week-view.c:345
+#: calendar/gui/print.c:769
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:347
-#: calendar/gui/print.c:767
+#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:348
+#: calendar/gui/print.c:771
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3422 calendar/gui/e-week-view.c:3270
+#: calendar/gui/e-day-view.c:3424 calendar/gui/e-week-view.c:3278
 #, fuzzy
 msgid "New All Day _Event"
 msgstr "Ny &hending ..."
 
-#: calendar/gui/e-day-view.c:3432 calendar/gui/e-week-view.c:3280
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3288
 #: ui/evolution-calendar.xml.h:17
 #, fuzzy
 msgid "Go to _Today"
 msgstr "G� til &i dag"
 
-#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3282
+#: calendar/gui/e-day-view.c:3436 calendar/gui/e-week-view.c:3290
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "&G� til side ..."
 
-#: calendar/gui/e-day-view.c:3443 calendar/gui/e-week-view.c:3290
+#: calendar/gui/e-day-view.c:3445 calendar/gui/e-week-view.c:3298
 #, fuzzy
 msgid "_Delete this Appointment"
 msgstr "&Slett avtale"
 
-#: calendar/gui/e-day-view.c:3462 calendar/gui/e-week-view.c:3315
+#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3323
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "Se&nd avtale"
 
-#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3317
+#: calendar/gui/e-day-view.c:3466 calendar/gui/e-week-view.c:3325
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "Erstatt denne f�rekomsten?"
 
-#: calendar/gui/e-day-view.c:3466 calendar/gui/e-week-view.c:3319
+#: calendar/gui/e-day-view.c:3468 calendar/gui/e-week-view.c:3327
 #, fuzzy
 msgid "Delete _All Occurrences"
 msgstr "Slettar klassen"
 
+#: calendar/gui/e-itip-control.c:469
+msgid "Meeting begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:474
+msgid "Task begins: <b>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:479